Move controller names to the naming package

Author: cbandy

cmd/postgres-operator/main.go

@@ -307,8 +307,8 @@ func main() {
 func addControllersToManager(mgr runtime.Manager, log logging.Logger, reg registration.Registration) {
 	pgReconciler := &postgrescluster.Reconciler{
 		Client:       mgr.GetClient(),
-		Owner:        postgrescluster.ControllerName,
-		Recorder:     mgr.GetEventRecorderFor(postgrescluster.ControllerName),
+		Owner:        naming.ControllerPostgresCluster,
+		Recorder:     mgr.GetEventRecorderFor(naming.ControllerPostgresCluster),
 		Registration: reg,
 	}
 
@@ -319,8 +319,8 @@ func addControllersToManager(mgr runtime.Manager, log logging.Logger, reg regist
 
 	upgradeReconciler := &pgupgrade.PGUpgradeReconciler{
 		Client:       mgr.GetClient(),
-		Owner:        "pgupgrade-controller",
-		Recorder:     mgr.GetEventRecorderFor("pgupgrade-controller"),
+		Owner:        naming.ControllerPGUpgrade,
+		Recorder:     mgr.GetEventRecorderFor(naming.ControllerPGUpgrade),
 		Registration: reg,
 	}
 
@@ -331,7 +331,7 @@ func addControllersToManager(mgr runtime.Manager, log logging.Logger, reg regist
 
 	pgAdminReconciler := &standalone_pgadmin.PGAdminReconciler{
 		Client:   mgr.GetClient(),
-		Owner:    "pgadmin-controller",
+		Owner:    naming.ControllerPGAdmin,
 		Recorder: mgr.GetEventRecorderFor(naming.ControllerPGAdmin),
 	}
 
@@ -347,10 +347,8 @@ func addControllersToManager(mgr runtime.Manager, log logging.Logger, reg regist
 	}
 
 	crunchyBridgeClusterReconciler := &crunchybridgecluster.CrunchyBridgeClusterReconciler{
-		Client: mgr.GetClient(),
-		Owner:  "crunchybridgecluster-controller",
-		// TODO(crunchybridgecluster): recorder?
-		// Recorder: mgr.GetEventRecorderFor(naming...),
+		Client:    mgr.GetClient(),
+		Owner:     naming.ControllerCrunchyBridgeCluster,
 		NewClient: constructor,
 	}
 

internal/controller/postgrescluster/controller.go

@@ -33,17 +33,15 @@ import (
 	"github.com/crunchydata/postgres-operator/internal/initialize"
 	"github.com/crunchydata/postgres-operator/internal/kubernetes"
 	"github.com/crunchydata/postgres-operator/internal/logging"
+	"github.com/crunchydata/postgres-operator/internal/naming"
 	"github.com/crunchydata/postgres-operator/internal/pki"
 	"github.com/crunchydata/postgres-operator/internal/postgres"
 	"github.com/crunchydata/postgres-operator/internal/registration"
 	"github.com/crunchydata/postgres-operator/internal/tracing"
 	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
-const (
-	// ControllerName is the name of the PostgresCluster controller
-	ControllerName = "postgrescluster-controller"
-)
+const controllerName = naming.ControllerPostgresCluster
 
 // Reconciler holds resources for the PostgresCluster reconciler
 type Reconciler struct {

internal/controller/postgrescluster/controller_ref_manager.go

@@ -41,7 +41,7 @@ func (r *Reconciler) adoptObject(ctx context.Context, postgresCluster *v1beta1.P
 
 	return r.Client.Patch(ctx, obj, client.RawPatch(types.StrategicMergePatchType,
 		patchBytes), &client.PatchOptions{
-		FieldManager: ControllerName,
+		FieldManager: controllerName,
 	})
 }
 

internal/controller/postgrescluster/pgbackrest_test.go

@@ -179,8 +179,8 @@ func TestReconcilePGBackRest(t *testing.T) {
 	ctx, cancel := setupManager(t, cfg, func(mgr manager.Manager) {
 		r = &Reconciler{
 			Client:   mgr.GetClient(),
-			Recorder: mgr.GetEventRecorderFor(ControllerName),
-			Owner:    ControllerName,
+			Recorder: mgr.GetEventRecorderFor(controllerName),
+			Owner:    controllerName,
 		}
 	})
 	t.Cleanup(func() { teardownManager(cancel, t) })
@@ -805,8 +805,8 @@ func TestReconcileStanzaCreate(t *testing.T) {
 	ctx, cancel := setupManager(t, cfg, func(mgr manager.Manager) {
 		r = &Reconciler{
 			Client:   mgr.GetClient(),
-			Recorder: mgr.GetEventRecorderFor(ControllerName),
-			Owner:    ControllerName,
+			Recorder: mgr.GetEventRecorderFor(controllerName),
+			Owner:    controllerName,
 		}
 	})
 	t.Cleanup(func() { teardownManager(cancel, t) })
@@ -1087,8 +1087,8 @@ func TestReconcileManualBackup(t *testing.T) {
 	_, cancel := setupManager(t, cfg, func(mgr manager.Manager) {
 		r = &Reconciler{
 			Client:   mgr.GetClient(),
-			Recorder: mgr.GetEventRecorderFor(ControllerName),
-			Owner:    ControllerName,
+			Recorder: mgr.GetEventRecorderFor(controllerName),
+			Owner:    controllerName,
 		}
 	})
 	t.Cleanup(func() { teardownManager(cancel, t) })
@@ -1831,8 +1831,8 @@ func TestReconcilePostgresClusterDataSource(t *testing.T) {
 	ctx, cancel := setupManager(t, cfg, func(mgr manager.Manager) {
 		r = &Reconciler{
 			Client:   tClient,
-			Recorder: mgr.GetEventRecorderFor(ControllerName),
-			Owner:    ControllerName,
+			Recorder: mgr.GetEventRecorderFor(controllerName),
+			Owner:    controllerName,
 		}
 	})
 	t.Cleanup(func() { teardownManager(cancel, t) })
@@ -2210,8 +2210,8 @@ func TestReconcileCloudBasedDataSource(t *testing.T) {
 	ctx, cancel := setupManager(t, cfg, func(mgr manager.Manager) {
 		r = &Reconciler{
 			Client:   tClient,
-			Recorder: mgr.GetEventRecorderFor(ControllerName),
-			Owner:    ControllerName,
+			Recorder: mgr.GetEventRecorderFor(controllerName),
+			Owner:    controllerName,
 		}
 	})
 	t.Cleanup(func() { teardownManager(cancel, t) })
@@ -2635,7 +2635,7 @@ func TestGenerateBackupJobIntent(t *testing.T) {
 
 	r := &Reconciler{
 		Client: cc,
-		Owner:  ControllerName,
+		Owner:  controllerName,
 	}
 
 	ctx := context.Background()
@@ -3931,8 +3931,8 @@ func TestReconcileScheduledBackups(t *testing.T) {
 	_, cancel := setupManager(t, cfg, func(mgr manager.Manager) {
 		r = &Reconciler{
 			Client:   mgr.GetClient(),
-			Recorder: mgr.GetEventRecorderFor(ControllerName),
-			Owner:    ControllerName,
+			Recorder: mgr.GetEventRecorderFor(controllerName),
+			Owner:    controllerName,
 		}
 	})
 	t.Cleanup(func() { teardownManager(cancel, t) })
@@ -4267,8 +4267,8 @@ func TestBackupsEnabled(t *testing.T) {
 	ctx, cancel := setupManager(t, cfg, func(mgr manager.Manager) {
 		r = &Reconciler{
 			Client:   mgr.GetClient(),
-			Recorder: mgr.GetEventRecorderFor(ControllerName),
-			Owner:    ControllerName,
+			Recorder: mgr.GetEventRecorderFor(controllerName),
+			Owner:    controllerName,
 		}
 	})
 	t.Cleanup(func() { teardownManager(cancel, t) })

internal/controller/postgrescluster/pki_test.go

@@ -43,7 +43,7 @@ func TestReconcileCerts(t *testing.T) {
 
 	r := &Reconciler{
 		Client: tClient,
-		Owner:  ControllerName,
+		Owner:  controllerName,
 	}
 
 	// set up cluster1

internal/naming/controllers.go

@@ -5,6 +5,9 @@
 package naming
 
 const (
-	ControllerBridge  = "bridge-controller"
-	ControllerPGAdmin = "pgadmin-controller"
+	ControllerBridge               = "bridge-controller"
+	ControllerCrunchyBridgeCluster = "crunchybridgecluster-controller"
+	ControllerPGAdmin              = "pgadmin-controller"
+	ControllerPGUpgrade            = "pgupgrade-controller"
+	ControllerPostgresCluster      = "postgrescluster-controller"
 )

internal/upgradecheck/header.go

@@ -16,7 +16,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/crunchydata/postgres-operator/internal/controller/postgrescluster"
 	"github.com/crunchydata/postgres-operator/internal/feature"
 	"github.com/crunchydata/postgres-operator/internal/kubernetes"
 	"github.com/crunchydata/postgres-operator/internal/logging"
@@ -128,7 +127,7 @@ func manageUpgradeCheckConfigMap(ctx context.Context, crClient crclient.Client,
 		}
 	}
 
-	err = applyConfigMap(ctx, crClient, cm, postgrescluster.ControllerName)
+	err = applyConfigMap(ctx, crClient, cm, naming.ControllerPostgresCluster)
 	if err != nil {
 		log.V(1).Info("upgrade check issue: could not apply configmap",
 			"response", err.Error())