Reorder otel kuttl test so that we check pgadmin logs right after we add the instrumentation spec to PGAdmin.

Author: dsessler7

testing/kuttl/e2e/otel-logging-and-metrics/01--add-instrumentation.yaml renamed to testing/kuttl/e2e/otel-logging-and-metrics/01--add-instrumentation-to-postgrescluster.yaml

@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- files/05--annotate-cluster.yaml
+assert:
+- files/05-backup-completed.yaml

testing/kuttl/e2e/otel-logging-and-metrics/05-assert-repo-host-does-not-logs.yaml renamed to testing/kuttl/e2e/otel-logging-and-metrics/04-assert-repo-host-does-not-logs.yaml

@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- files/07--add-instrumentation.yaml
+assert:
+- files/07-instrumentation-added.yaml

testing/kuttl/e2e/otel-logging-and-metrics/05--backup.yaml

@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- files/09--add-custom-queries.yaml
+assert:
+- files/09-custom-queries-added.yaml

testing/kuttl/e2e/otel-logging-and-metrics/06--backup.yaml

@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- files/11--add-logs-exporter.yaml
+assert:
+- files/11-logs-exporter-added.yaml

testing/kuttl/e2e/otel-logging-and-metrics/07-assert-repo-host-contains-logs.yaml renamed to testing/kuttl/e2e/otel-logging-and-metrics/06-assert-repo-host-contains-logs.yaml

@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- files/13--create-cluster.yaml
+assert:
+- files/13-cluster-created.yaml

testing/kuttl/e2e/otel-logging-and-metrics/07--add-instrumentation-to-pgadmin.yaml

@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 apply:
-- files/14--add-backups.yaml
+- files/15--add-backups.yaml
 assert:
-- files/14-backups-added.yaml
+- files/15-backups-added.yaml

testing/kuttl/e2e/otel-logging-and-metrics/08--add-custom-queries.yaml

@@ -4,4 +4,4 @@ commands:
 - command: kubectl annotate postgrescluster otel-cluster-no-backups postgres-operator.crunchydata.com/authorizeBackupRemoval="true"
   namespaced: true
 assert:
-- files/16-backups-removed.yaml
+- files/17-backups-removed.yaml

testing/kuttl/e2e/otel-logging-and-metrics/04-assert-pgadmin.yaml renamed to testing/kuttl/e2e/otel-logging-and-metrics/08-assert-pgadmin.yaml

@@ -34,29 +34,3 @@ spec:
   proxy:
     pgBouncer: {}
   instrumentation: {}
----
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PGAdmin
-metadata:
-  name: otel-pgadmin
-spec:
-  users:
-    - username: [email protected]
-      role: Administrator
-      passwordRef:
-        name: pgadmin-password-secret
-        key: otel-password
-  dataVolumeClaimSpec:
-    accessModes:
-    - "ReadWriteOnce"
-    resources:
-      requests:
-        storage: 1Gi
-  serverGroups:
-    - name: supply
-      # An empty selector selects all postgresclusters in the Namespace
-      postgresClusterSelector: {}
-  config:
-    settings:
-      AUTHENTICATION_SOURCES: ['internal']
-  instrumentation: {}

testing/kuttl/e2e/otel-logging-and-metrics/09--add-custom-queries.yaml

@@ -99,12 +99,8 @@ metadata:
     postgres-operator.crunchydata.com/data: pgadmin
     postgres-operator.crunchydata.com/role: pgadmin
     postgres-operator.crunchydata.com/pgadmin: otel-pgadmin
-    postgres-operator.crunchydata.com/crunchy-otel-collector: "true"
 status:
   containerStatuses:
-  - name: collector
-    ready: true
-    started: true
   - name: pgadmin
     ready: true
     started: true

testing/kuttl/e2e/otel-logging-and-metrics/10--add-logs-exporter.yaml

@@ -0,0 +1,26 @@
+---
+apiVersion: postgres-operator.crunchydata.com/v1beta1
+kind: PGAdmin
+metadata:
+  name: otel-pgadmin
+spec:
+  users:
+    - username: [email protected]
+      role: Administrator
+      passwordRef:
+        name: pgadmin-password-secret
+        key: otel-password
+  dataVolumeClaimSpec:
+    accessModes:
+    - "ReadWriteOnce"
+    resources:
+      requests:
+        storage: 1Gi
+  serverGroups:
+    - name: supply
+      # An empty selector selects all postgresclusters in the Namespace
+      postgresClusterSelector: {}
+  config:
+    settings:
+      AUTHENTICATION_SOURCES: ['internal']
+  instrumentation: {}

testing/kuttl/e2e/otel-logging-and-metrics/09-assert-custom-queries.yaml renamed to testing/kuttl/e2e/otel-logging-and-metrics/10-assert-custom-queries.yaml

@@ -0,0 +1,120 @@
+apiVersion: postgres-operator.crunchydata.com/v1beta1
+kind: PostgresCluster
+metadata:
+  name: otel-cluster
+status:
+  instances:
+    - name: instance1
+      readyReplicas: 1
+      replicas: 1
+      updatedReplicas: 1
+  proxy:
+    pgBouncer:
+      readyReplicas: 1
+      replicas: 1
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/data: postgres
+    postgres-operator.crunchydata.com/role: master
+    postgres-operator.crunchydata.com/cluster: otel-cluster
+    postgres-operator.crunchydata.com/crunchy-otel-collector: "true"
+status:
+  containerStatuses:
+  - name: collector
+    ready: true
+    started: true
+  - name: database
+    ready: true
+    started: true
+  - name: pgbackrest
+    ready: true
+    started: true
+  - name: pgbackrest-config
+    ready: true
+    started: true
+  - name: replication-cert-copy
+    ready: true
+    started: true
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/data: pgbackrest
+    postgres-operator.crunchydata.com/cluster: otel-cluster
+    postgres-operator.crunchydata.com/crunchy-otel-collector: "true"
+status:
+  containerStatuses:
+  - name: collector
+    ready: true
+    started: true
+  - name: pgbackrest
+    ready: true
+    started: true
+  - name: pgbackrest-config
+    ready: true
+    started: true
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/role: pgbouncer
+    postgres-operator.crunchydata.com/cluster: otel-cluster
+    postgres-operator.crunchydata.com/crunchy-otel-collector: "true"
+status:
+  containerStatuses:
+  - name: collector
+    ready: true
+    started: true
+  - name: pgbouncer
+    ready: true
+    started: true
+  - name: pgbouncer-config
+    ready: true
+    started: true
+  phase: Running
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: otel-cluster-primary
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/role: pgadmin
+    postgres-operator.crunchydata.com/pgadmin: otel-pgadmin
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/data: pgadmin
+    postgres-operator.crunchydata.com/role: pgadmin
+    postgres-operator.crunchydata.com/pgadmin: otel-pgadmin
+    postgres-operator.crunchydata.com/crunchy-otel-collector: "true"
+status:
+  containerStatuses:
+  - name: collector
+    ready: true
+    started: true
+  - name: pgadmin
+    ready: true
+    started: true
+  phase: Running
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/role: pgadmin
+    postgres-operator.crunchydata.com/pgadmin: otel-pgadmin
+type: Opaque
+---