Only add metrics port when a component in the pod has metrics to serve.

Author: dsessler7

internal/collector/instance.go

@@ -48,6 +48,7 @@ func AddToPod(
 	sqlQueryPassword string,
 	logDirectories []string,
 	includeLogrotate bool,
+	includeMetricsPort bool,
 ) {
 	if spec == nil ||
 		!(feature.Enabled(ctx, feature.OpenTelemetryLogs) ||
@@ -153,7 +154,7 @@ func AddToPod(
 		template.Spec.Volumes = append(template.Spec.Volumes, logrotateConfigVolume)
 	}
 
-	if feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
+	if feature.Enabled(ctx, feature.OpenTelemetryMetrics) && includeMetricsPort {
 		container.Ports = []corev1.ContainerPort{{
 			ContainerPort: int32(PrometheusPort),
 			Name:          "otel-metrics",

internal/controller/postgrescluster/instance.go

@@ -1222,7 +1222,7 @@ func (r *Reconciler) reconcileInstance(
 		// but we are using it for pgbackrest logs in the postgres pod
 		collector.AddToPod(ctx, cluster.Spec.Instrumentation, cluster.Spec.ImagePullPolicy, instanceConfigMap, &instance.Spec.Template,
 			[]corev1.VolumeMount{postgres.DataVolumeMount()}, pgPassword,
-			[]string{naming.PGBackRestPGDataLogPath}, true)
+			[]string{naming.PGBackRestPGDataLogPath}, true, true)
 	}
 
 	// Add postgres-exporter to the instance Pod spec

internal/controller/postgrescluster/pgbackrest.go

@@ -698,7 +698,7 @@ func (r *Reconciler) generateRepoHostIntent(ctx context.Context, postgresCluster
 			collector.AddToPod(ctx, postgresCluster.Spec.Instrumentation, postgresCluster.Spec.ImagePullPolicy,
 				&corev1.ConfigMap{ObjectMeta: naming.PGBackRestConfig(postgresCluster)},
 				&repo.Spec.Template, []corev1.VolumeMount{}, "",
-				[]string{pgBackRestLogPath}, true)
+				[]string{pgBackRestLogPath}, true, false)
 
 			containersToAdd = append(containersToAdd, naming.ContainerCollector)
 		}

internal/controller/standalone_pgadmin/statefulset.go

@@ -134,7 +134,8 @@ func statefulset(
 		}
 
 		collector.AddToPod(ctx, pgadmin.Spec.Instrumentation, pgadmin.Spec.ImagePullPolicy,
-			configmap, &sts.Spec.Template, volumeMounts, "", []string{LogDirectoryAbsolutePath}, false)
+			configmap, &sts.Spec.Template, volumeMounts, "", []string{LogDirectoryAbsolutePath},
+			false, false)
 	}
 
 	postgrescluster.AddTMPEmptyDir(&sts.Spec.Template)

internal/pgbouncer/reconcile.go

@@ -192,8 +192,8 @@ func Pod(
 
 	if feature.Enabled(ctx, feature.OpenTelemetryLogs) || feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
 		collector.AddToPod(ctx, inCluster.Spec.Instrumentation, inCluster.Spec.ImagePullPolicy, inConfigMap,
-			template, []corev1.VolumeMount{configVolumeMount}, string(inSecret.Data["pgbouncer-password"]), []string{naming.PGBouncerLogPath},
-			true)
+			template, []corev1.VolumeMount{configVolumeMount}, string(inSecret.Data["pgbouncer-password"]),
+			[]string{naming.PGBouncerLogPath}, true, true)
 	}
 }