rebase

Author: philrhurst

internal/controller/standalone_pgadmin/statefulset.go

@@ -19,6 +19,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/crunchydata/postgres-operator/internal/collector"
+	"github.com/crunchydata/postgres-operator/internal/controller/postgrescluster"
 	"github.com/crunchydata/postgres-operator/internal/feature"
 	"github.com/crunchydata/postgres-operator/internal/initialize"
 	"github.com/crunchydata/postgres-operator/internal/naming"
@@ -126,8 +127,9 @@ func statefulset(
 
 	pod(pgadmin, configmap, &sts.Spec.Template.Spec, dataVolume, oauthSecrets)
 
-	if feature.Enabled(ctx, feature.OpenTelemetryLogs) {
+	if pgadmin.Spec.Instrumentation != nil && feature.Enabled(ctx, feature.OpenTelemetryLogs) {
 		// Logs for gunicorn and pgadmin write to /var/lib/pgadmin/logs
+		// so the collector needs access to that that path.
 		dataVolumeMount := corev1.VolumeMount{
 			Name:      "pgadmin-data",
 			MountPath: "/var/lib/pgadmin",
@@ -137,9 +139,11 @@ func statefulset(
 		}
 
 		collector.AddToPod(ctx, pgadmin.Spec.Instrumentation, pgadmin.Spec.ImagePullPolicy,
-			configmap, &sts.Spec.Template.Spec, volumeMounts, "", []string{}, false)
+			configmap, &sts.Spec.Template.Spec, volumeMounts, "", []string{LogDirectoryAbsolutePath}, false)
 	}
 
+	postgrescluster.AddTMPEmptyDir(&sts.Spec.Template)
+
 	// Determine if a rollout is needed because Secrets and ConfigMaps have changed.
 	// If the OAuth Secrets are changed, or if the OAUTH2_CONFIG changes in the
 	// PGAdmin ConfigMap, then we need to restart the pgAdmin process and re-run