Moves guard into reconcileExporterWebConfig

Author: tony-landreth

internal/controller/postgrescluster/controller.go

@@ -30,7 +30,6 @@ import (
 	"github.com/crunchydata/postgres-operator/internal/collector"
 	"github.com/crunchydata/postgres-operator/internal/config"
 	"github.com/crunchydata/postgres-operator/internal/controller/runtime"
-	"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/logging"
@@ -345,7 +344,7 @@ func (r *Reconciler) Reconcile(
 	if err == nil {
 		exporterQueriesConfig, err = r.reconcileExporterQueriesConfig(ctx, cluster)
 	}
-	if err == nil && !feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
+	if err == nil {
 		exporterWebConfig, err = r.reconcileExporterWebConfig(ctx, cluster)
 	}
 	if err == nil {

internal/controller/postgrescluster/pgmonitor.go

@@ -402,6 +402,10 @@ func addPGMonitorExporterToInstancePodSpec(
 func (r *Reconciler) reconcileExporterWebConfig(ctx context.Context,
 	cluster *v1beta1.PostgresCluster) (*corev1.ConfigMap, error) {
 
+	if feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
+		return nil, nil
+	}
+
 	existing := &corev1.ConfigMap{ObjectMeta: naming.ExporterWebConfigMap(cluster)}
 	err := errors.WithStack(r.Client.Get(ctx, client.ObjectKeyFromObject(existing), existing))
 	if client.IgnoreNotFound(err) != nil {