changes for cm version

Author: benjaminjb

internal/controller/standalone_pgadmin/configmap.go

@@ -64,9 +64,9 @@ func configmap(ctx context.Context, pgadmin *v1beta1.PGAdmin,
 
 	// TODO(tjmoore4): Populate configuration details.
 	initialize.Map(&configmap.Data)
-	pgadminConfigSettings, err := generateConfig(ctx, pgadmin)
+	configSettings, err := generateConfig(ctx, pgadmin)
 	if err == nil {
-		configmap.Data[settingsConfigMapKey] = pgadminConfigSettings
+		configmap.Data[settingsConfigMapKey] = configSettings
 	}
 
 	clusterSettings, err := generateClusterConfig(clusters)
@@ -84,9 +84,7 @@ func configmap(ctx context.Context, pgadmin *v1beta1.PGAdmin,
 }
 
 // generateConfigs generates the config settings for the pgAdmin and gunicorn
-func generateConfig(ctx context.Context, pgadmin *v1beta1.PGAdmin) (
-	string, error,
-) {
+func generateConfig(ctx context.Context, pgadmin *v1beta1.PGAdmin) (string, error) {
 	settings := map[string]any{
 		// Bind to all IPv4 addresses by default. "0.0.0.0" here represents INADDR_ANY.
 		// - https://flask.palletsprojects.com/en/2.2.x/api/#flask.Flask.run
@@ -261,6 +259,10 @@ func generateGunicornConfig(ctx context.Context, pgadmin *v1beta1.PGAdmin) (
 	encoder.SetIndent("", "  ")
 	err := encoder.Encode(settings)
 
+	if err != nil {
+		return buffer.String(), "", err
+	}
+
 	// Gunicorn logging dict settings
 	logSettings := map[string]any{}
 
@@ -357,8 +359,6 @@ func generateGunicornConfig(ctx context.Context, pgadmin *v1beta1.PGAdmin) (
 	logEncoder := json.NewEncoder(logBuffer)
 	logEncoder.SetEscapeHTML(false)
 	logEncoder.SetIndent("", "  ")
-
-	// Combine errors
 	err = logEncoder.Encode(logSettings)
 
 	return buffer.String(), logBuffer.String(), err

internal/controller/standalone_pgadmin/pod.go

@@ -45,7 +45,6 @@ const (
 
 // pod populates a PodSpec with the container and volumes needed to run pgAdmin.
 func pod(
-	ctx context.Context,
 	inPGAdmin *v1beta1.PGAdmin,
 	inConfigMap *corev1.ConfigMap,
 	outPod *corev1.PodSpec,
@@ -156,7 +155,7 @@ func pod(
 
 	startup := corev1.Container{
 		Name:            naming.ContainerPGAdminStartup,
-		Command:         startupCommand(ctx, inPGAdmin),
+		Command:         startupCommand(inPGAdmin),
 		Image:           container.Image,
 		ImagePullPolicy: container.ImagePullPolicy,
 		Resources:       container.Resources,
@@ -347,7 +346,7 @@ done
 }
 
 // startupCommand returns an entrypoint that prepares the filesystem for pgAdmin.
-func startupCommand(ctx context.Context, inPgadmin *v1beta1.PGAdmin) []string {
+func startupCommand(inPgadmin *v1beta1.PGAdmin) []string {
 	// pgAdmin reads from the `/etc/pgadmin/config_system.py` file during startup
 	// after all other config files.
 	// - https://github.com/pgadmin-org/pgadmin4/blob/REL-7_7/docs/en_US/config_py.rst

internal/controller/standalone_pgadmin/pod_test.go

@@ -13,7 +13,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/crunchydata/postgres-operator/internal/feature"
 	"github.com/crunchydata/postgres-operator/internal/initialize"
 	"github.com/crunchydata/postgres-operator/internal/kubernetes"
 	"github.com/crunchydata/postgres-operator/internal/testing/cmp"
@@ -29,9 +28,8 @@ func TestPod(t *testing.T) {
 	config := new(corev1.ConfigMap)
 	testpod := new(corev1.PodSpec)
 	pvc := new(corev1.PersistentVolumeClaim)
-	ctx := context.Background()
 
-	call := func() { pod(ctx, pgadmin, config, testpod, pvc) }
+	call := func() { pod(pgadmin, config, testpod, pvc) }
 
 	t.Run("Defaults", func(t *testing.T) {
 
@@ -223,13 +221,6 @@ volumes:
 			},
 		}
 
-		// Turn on the Feature gate
-		gate := feature.NewGate()
-		assert.NilError(t, gate.SetFromMap(map[string]bool{
-			feature.OpenTelemetryLogs: true,
-		}))
-		ctx = feature.NewContext(context.Background(), gate)
-
 		call()
 
 		assert.Assert(t, cmp.MarshalMatches(testpod, `

internal/controller/standalone_pgadmin/statefulset.go

@@ -120,7 +120,7 @@ func statefulset(
 
 	sts.Spec.Template.Spec.SecurityContext = podSecurityContext(ctx)
 
-	pod(ctx, pgadmin, configmap, &sts.Spec.Template.Spec, dataVolume)
+	pod(pgadmin, configmap, &sts.Spec.Template.Spec, dataVolume)
 
 	if pgadmin.Spec.Instrumentation != nil && feature.Enabled(ctx, feature.OpenTelemetryLogs) {
 		// Logs for gunicorn and pgadmin write to /var/lib/pgadmin/logs