Remove pgAdmin feature gate

PGO-558
CrunchyData · Oct 13, 2023 · e59caac · e59caac
1 parent c9e3267
commit e59caac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/cmd/postgres-operator/main.go b/cmd/postgres-operator/main.go
@@ -152,18 +152,16 @@ func addControllersToManager(mgr manager.Manager, openshift bool, log logr.Logge
 		os.Exit(1)
 	}
 
-	if util.DefaultMutableFeatureGate.Enabled(util.StandalonePGAdmin) {
-		pgAdminReconciler := &standalone_pgadmin.PGAdminReconciler{
-			Client:   mgr.GetClient(),
-			Owner:    "pgadmin-controller",
-			Recorder: mgr.GetEventRecorderFor(naming.ControllerPGAdmin),
-			Scheme:   mgr.GetScheme(),
-		}
+	pgAdminReconciler := &standalone_pgadmin.PGAdminReconciler{
+		Client:   mgr.GetClient(),
+		Owner:    "pgadmin-controller",
+		Recorder: mgr.GetEventRecorderFor(naming.ControllerPGAdmin),
+		Scheme:   mgr.GetScheme(),
+	}
 
-		if err := pgAdminReconciler.SetupWithManager(mgr); err != nil {
-			log.Error(err, "unable to create PGAdmin controller")
-			os.Exit(1)
-		}
+	if err := pgAdminReconciler.SetupWithManager(mgr); err != nil {
+		log.Error(err, "unable to create PGAdmin controller")
+		os.Exit(1)
 	}
 }
 

diff --git a/internal/util/features.go b/internal/util/features.go
@@ -43,9 +43,6 @@ const (
 	// Enables support of custom sidecars for pgBouncer Pods
 	PGBouncerSidecars featuregate.Feature = "PGBouncerSidecars"
 	//
-	// Enables support of standalone pgAdmin instances
-	StandalonePGAdmin featuregate.Feature = "StandalonePGAdmin"
-	//
 	// Enables support of tablespace volumes
 	TablespaceVolumes featuregate.Feature = "TablespaceVolumes"
 )
@@ -61,7 +58,6 @@ var pgoFeatures = map[featuregate.Feature]featuregate.FeatureSpec{
 	AppendCustomQueries: {Default: false, PreRelease: featuregate.Alpha},
 	BridgeIdentifiers:   {Default: false, PreRelease: featuregate.Alpha},
 	InstanceSidecars:    {Default: false, PreRelease: featuregate.Alpha},
-	StandalonePGAdmin:   {Default: false, PreRelease: featuregate.Alpha},
 	PGBouncerSidecars:   {Default: false, PreRelease: featuregate.Alpha},
 	TablespaceVolumes:   {Default: false, PreRelease: featuregate.Alpha},
 }

diff --git a/testing/kuttl/e2e-other/standalone-pgadmin/README.md b/testing/kuttl/e2e-other/standalone-pgadmin/README.md
@@ -1,6 +1,5 @@
 ** pgAdmin **
 
-Note: requires the StandalonePGAdmin FeatureGate enabled.
 Note: due to the (random) namespace being part of the host, we cannot check the configmap using the usual assert/file pattern.
 
 *Phase one*