Merge pull request #265 from knelasevero/use-constant-controller-names

use constant controller names

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/google/gofuzz v1.2.0
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/golang-lru v0.5.4
-	github.com/openshift/api v0.0.0-20230711095040-ca06f4a23b64
+	github.com/openshift/api v0.0.0-20230811093819-1468e815af63
 	github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533
 	github.com/openshift/client-go v0.0.0-20230705133330-7f808ad59404
 	github.com/openshift/library-go v0.0.0-20230706195801-561433066966

pkg/cmd/controller/config.go

@@ -1,27 +1,31 @@
 package controller
 
-var ControllerInitializers = map[string]InitFunc{
-	"openshift.io/serviceaccount": RunServiceAccountController,
+import (
+	openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1"
+)
+
+var ControllerInitializers = map[openshiftcontrolplanev1.OpenShiftControllerName]InitFunc{
+	openshiftcontrolplanev1.OpenShiftServiceAccountController: RunServiceAccountController,
 
-	"openshift.io/default-rolebindings": RunDefaultRoleBindingController,
+	openshiftcontrolplanev1.OpenShiftDefaultRoleBindingsController: RunDefaultRoleBindingController,
 
-	"openshift.io/serviceaccount-pull-secrets": RunServiceAccountPullSecretsController,
-	"openshift.io/origin-namespace":            RunOriginNamespaceController,
+	openshiftcontrolplanev1.OpenShiftServiceAccountPullSecretsController: RunServiceAccountPullSecretsController,
+	openshiftcontrolplanev1.OpenshiftOriginNamespaceController:           RunOriginNamespaceController,
 
-	"openshift.io/build":               RunBuildController,
-	"openshift.io/build-config-change": RunBuildConfigChangeController,
+	openshiftcontrolplanev1.OpenshiftBuildController:             RunBuildController,
+	openshiftcontrolplanev1.OpenshiftBuildConfigChangeController: RunBuildConfigChangeController,
 
-	"openshift.io/deployer":         RunDeployerController,
-	"openshift.io/deploymentconfig": RunDeploymentConfigController,
+	openshiftcontrolplanev1.OpenshiftDeployerController:         RunDeployerController,
+	openshiftcontrolplanev1.OpenshiftDeploymentConfigController: RunDeploymentConfigController,
 
-	"openshift.io/image-trigger":          RunImageTriggerController,
-	"openshift.io/image-import":           RunImageImportController,
-	"openshift.io/image-signature-import": RunImageSignatureImportController,
+	openshiftcontrolplanev1.OpenshiftImageTriggerController:         RunImageTriggerController,
+	openshiftcontrolplanev1.OpenshiftImageImportController:          RunImageImportController,
+	openshiftcontrolplanev1.OpenshiftImageSignatureImportController: RunImageSignatureImportController,
 
-	"openshift.io/templateinstance":          RunTemplateInstanceController,
-	"openshift.io/templateinstancefinalizer": RunTemplateInstanceFinalizerController,
+	openshiftcontrolplanev1.OpenshiftTemplateInstanceController:          RunTemplateInstanceController,
+	openshiftcontrolplanev1.OpenshiftTemplateInstanceFinalizerController: RunTemplateInstanceFinalizerController,
 
-	"openshift.io/unidling": RunUnidlingController,
+	openshiftcontrolplanev1.OpenshiftUnidlingController: RunUnidlingController,
 }
 
 const (

pkg/cmd/openshift-controller-manager/controller_manager.go

@@ -138,7 +138,7 @@ func WaitForHealthyAPIServer(client rest.Interface) error {
 // allocation controller is passed in because it wants direct etcd access.  Naughty.
 func startControllers(controllerContext *origincontrollers.ControllerContext) error {
 	for controllerName, initFn := range origincontrollers.ControllerInitializers {
-		if !controllerContext.IsControllerEnabled(controllerName) {
+		if !controllerContext.IsControllerEnabled(string(controllerName)) {
 			klog.Warningf("%q is disabled", controllerName)
 			continue
 		}