Fix tests

Author: benjaminjb

internal/pgbouncer/reconcile_test.go

@@ -142,6 +142,10 @@ func TestPod(t *testing.T) {
 	t.Parallel()
 
 	features := feature.NewGate()
+	assert.NilError(t, features.SetFromMap(map[string]bool{
+		feature.OpenTelemetryLogs:    true,
+		feature.OpenTelemetryMetrics: true,
+	}))
 	ctx := feature.NewContext(context.Background(), features)
 
 	cluster := new(v1beta1.PostgresCluster)
@@ -386,12 +390,6 @@ volumes:
 	})
 
 	t.Run("WithOtelNoLogSet", func(t *testing.T) {
-		featuresWithOtel := feature.NewGate()
-		assert.NilError(t, featuresWithOtel.SetFromMap(map[string]bool{
-			feature.OpenTelemetryLogs:    true,
-			feature.OpenTelemetryMetrics: true,
-		}))
-		ctx = feature.NewContext(context.Background(), featuresWithOtel)
 		cluster.Spec.Instrumentation = &v1beta1.InstrumentationSpec{}
 		logfile = "/tmp/pgbouncer.log"
 
@@ -431,6 +429,44 @@ containers:
   - mountPath: /etc/pgbouncer
     name: pgbouncer-config
     readOnly: true
+- command:
+  - bash
+  - -ceu
+  - --
+  - |-
+    monitor() {
+    exec {fd}<> <(:||:)
+    while read -r -t 5 -u "${fd}" ||:; do
+      if [[ "${directory}" -nt "/proc/self/fd/${fd}" ]] && pkill -HUP --exact pgbouncer
+      then
+        exec {fd}>&- && exec {fd}<> <(:||:)
+        stat --format='Loaded configuration dated %y' "${directory}"
+      fi
+    done
+    }; export directory="$1"; export -f monitor; exec -a "$0" bash -ceu monitor
+  - pgbouncer-config
+  - /etc/pgbouncer
+  image: image-town
+  imagePullPolicy: Always
+  name: pgbouncer-config
+  resources:
+    limits:
+      cpu: 5m
+      memory: 16Mi
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+      - ALL
+    privileged: false
+    readOnlyRootFilesystem: true
+    runAsNonRoot: true
+    seccompProfile:
+      type: RuntimeDefault
+  volumeMounts:
+  - mountPath: /etc/pgbouncer
+    name: pgbouncer-config
+    readOnly: true
 - command:
   - bash
   - -ceu
@@ -484,44 +520,6 @@ containers:
   - mountPath: /etc/logrotate.d
     name: logrotate-config
     readOnly: true
-- command:
-  - bash
-  - -ceu
-  - --
-  - |-
-    monitor() {
-    exec {fd}<> <(:||:)
-    while read -r -t 5 -u "${fd}" ||:; do
-      if [[ "${directory}" -nt "/proc/self/fd/${fd}" ]] && pkill -HUP --exact pgbouncer
-      then
-        exec {fd}>&- && exec {fd}<> <(:||:)
-        stat --format='Loaded configuration dated %y' "${directory}"
-      fi
-    done
-    }; export directory="$1"; export -f monitor; exec -a "$0" bash -ceu monitor
-  - pgbouncer-config
-  - /etc/pgbouncer
-  image: image-town
-  imagePullPolicy: Always
-  name: pgbouncer-config
-  resources:
-    limits:
-      cpu: 5m
-      memory: 16Mi
-  securityContext:
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop:
-      - ALL
-    privileged: false
-    readOnlyRootFilesystem: true
-    runAsNonRoot: true
-    seccompProfile:
-      type: RuntimeDefault
-  volumeMounts:
-  - mountPath: /etc/pgbouncer
-    name: pgbouncer-config
-    readOnly: true
 volumes:
 - name: pgbouncer-config
   projected:
@@ -549,6 +547,20 @@ volumes:
         items:
         - key: ca.crt
           path: ~postgres-operator/backend-ca.crt
+- name: logrotate-config
+  projected:
+    sources:
+    - configMap:
+        items:
+        - key: logrotate.conf
+          path: logrotate.conf
+- name: collector-config
+  projected:
+    sources:
+    - configMap:
+        items:
+        - key: collector.yaml
+          path: config.yaml
 			`))
 	})