Merge pull request #1887 from p0lyn0mial/expose-controller-instance-name

openshift-merge-bot[bot] · web-flow · commit 82abb012ad5a · 2024-11-19T15:08:33.000Z
API1835: expose WithControllerInstanceName for controllers under pkg/operator
diff --git a/pkg/operator/apiserver/controller/apiservice/apiservice_controller.go b/pkg/operator/apiserver/controller/apiservice/apiservice_controller.go
@@ -70,7 +70,7 @@ func NewAPIServiceController(
 		kubeClient:              kubeClient,
 	}
 
-	return factory.New().WithSync(c.sync).ResyncEvery(10*time.Second).WithInformers(
+	return factory.New().WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).ResyncEvery(10*time.Second).WithInformers(
 		append(informers,
 			kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Services().Informer(),
 			kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Endpoints().Informer(),
diff --git a/pkg/operator/apiserver/controller/auditpolicy/auditpolicy_controller.go b/pkg/operator/apiserver/controller/auditpolicy/auditpolicy_controller.go
@@ -54,7 +54,7 @@ func NewAuditPolicyController(
 		targetConfigMapName:    targetConfigMapName,
 	}
 
-	return factory.New().WithSync(c.sync).ResyncEvery(10*time.Second).WithInformers(
+	return factory.New().WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).ResyncEvery(10*time.Second).WithInformers(
 		configInformers.Config().V1().APIServers().Informer(),
 		kubeInformersForTargetNamesace.Core().V1().ConfigMaps().Informer(),
 		operatorClient.Informer(),
diff --git a/pkg/operator/apiserver/controller/workload/workload.go b/pkg/operator/apiserver/controller/workload/workload.go
@@ -111,6 +111,7 @@ func NewController(instanceName, operatorNamespace, targetNamespace, targetOpera
 	}
 
 	return c.WithSync(controllerRef.sync).
+		WithControllerInstanceName(controllerRef.controllerInstanceName).
 		WithInformers(informers...).
 		ToController(
 			fmt.Sprintf("%sWorkloadController", controllerRef.controllerInstanceName),
diff --git a/pkg/operator/configobserver/config_observer_controller.go b/pkg/operator/configobserver/config_observer_controller.go
@@ -122,6 +122,7 @@ func NewNestedConfigObserver(
 	return factory.New().
 		ResyncEvery(time.Minute).
 		WithSync(c.sync).
+		WithControllerInstanceName(c.controllerInstanceName).
 		WithInformers(append(informers, listersToInformer(listers)...)...).
 		ToController(
 			"ConfigObserver", // don't change what is passed here unless you also remove the old FooDegraded condition
diff --git a/pkg/operator/csi/csidrivernodeservicecontroller/csi_driver_node_service_controller.go b/pkg/operator/csi/csidrivernodeservicecontroller/csi_driver_node_service_controller.go
@@ -114,6 +114,8 @@ func NewCSIDriverNodeServiceController(
 		informers...,
 	).WithSync(
 		c.sync,
+	).WithControllerInstanceName(
+		c.controllerInstanceName,
 	).ResyncEvery(
 		time.Minute,
 	).WithSyncDegradedOnError(
diff --git a/pkg/operator/deploymentcontroller/deployment_controller.go b/pkg/operator/deploymentcontroller/deployment_controller.go
@@ -185,7 +185,7 @@ func (c *DeploymentController) ToController() (factory.Controller, error) {
 		c.operatorClient.Informer(),
 		c.deployInformer.Informer(),
 	)
-	controller := factory.New().WithInformers(
+	controller := factory.New().WithControllerInstanceName(c.controllerInstanceName).WithInformers(
 		informers...,
 	).WithSync(
 		c.sync,
diff --git a/pkg/operator/encryption/controllers/condition_controller.go b/pkg/operator/encryption/controllers/condition_controller.go
@@ -66,6 +66,7 @@ func NewConditionController(
 		deployer,
 	).ResyncEvery(time.Minute).
 		WithSync(c.sync).
+		WithControllerInstanceName(c.controllerInstanceName).
 		ToController(
 			c.controllerInstanceName,
 			eventRecorder.WithComponentSuffix("encryption-condition-controller"),
diff --git a/pkg/operator/encryption/controllers/key_controller.go b/pkg/operator/encryption/controllers/key_controller.go
@@ -106,6 +106,7 @@ func NewKeyController(
 
 	return factory.New().
 		WithSync(c.sync).
+		WithControllerInstanceName(c.controllerInstanceName).
 		ResyncEvery(time.Minute).
 		WithInformers(
 			apiServerInformer.Informer(),
diff --git a/pkg/operator/encryption/controllers/migration_controller.go b/pkg/operator/encryption/controllers/migration_controller.go
@@ -96,7 +96,7 @@ func NewMigrationController(
 		preconditionsFulfilledFn: preconditionsFulfilledFn,
 	}
 
-	return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithInformers(
+	return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).WithInformers(
 		migrator,
 		operatorClient.Informer(),
 		kubeInformersForNamespaces.InformersFor("openshift-config-managed").Core().V1().Secrets().Informer(),
diff --git a/pkg/operator/encryption/controllers/prune_controller.go b/pkg/operator/encryption/controllers/prune_controller.go
@@ -70,7 +70,7 @@ func NewPruneController(
 		secretClient:             secretClient,
 	}
 
-	return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithInformers(
+	return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).WithInformers(
 		operatorClient.Informer(),
 		kubeInformersForNamespaces.InformersFor("openshift-config-managed").Core().V1().Secrets().Informer(),
 		apiServerConfigInformer.Informer(), // do not remove, used by the precondition checker
diff --git a/pkg/operator/encryption/controllers/state_controller.go b/pkg/operator/encryption/controllers/state_controller.go
@@ -73,7 +73,7 @@ func NewStateController(
 		preconditionsFulfilledFn: preconditionsFulfilledFn,
 	}
 
-	return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithInformers(
+	return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).WithInformers(
 		operatorClient.Informer(),
 		kubeInformersForNamespaces.InformersFor("openshift-config-managed").Core().V1().Secrets().Informer(),
 		apiServerConfigInformer.Informer(), // do not remove, used by the precondition checker
diff --git a/pkg/operator/staleconditions/remove_stale_conditions.go b/pkg/operator/staleconditions/remove_stale_conditions.go
@@ -31,6 +31,7 @@ func NewRemoveStaleConditionsController(
 	return factory.New().
 		ResyncEvery(time.Minute).
 		WithSync(c.sync).
+		WithControllerInstanceName(c.controllerInstanceName).
 		WithInformers(operatorClient.Informer()).
 		ToController(
 			c.controllerInstanceName,
diff --git a/pkg/operator/staticpod/controller/installer/installer_controller.go b/pkg/operator/staticpod/controller/installer/installer_controller.go
@@ -194,12 +194,13 @@ func NewInstallerController(
 	}
 
 	c.ownerRefsFn = c.setOwnerRefs
-	c.factory = factory.New().WithInformers(
-		operatorClient.Informer(),
-		// informers are needed here because their Getter are cached lister based
-		kubeInformersForTargetNamespace.Core().V1().Pods().Informer(),
-		kubeInformersForTargetNamespace.Core().V1().ConfigMaps().Informer(),
-		kubeInformersForTargetNamespace.Core().V1().Secrets().Informer())
+	c.factory = factory.New().
+		WithInformers(
+			operatorClient.Informer(),
+			// informers are needed here because their Getter are cached lister based
+			kubeInformersForTargetNamespace.Core().V1().Pods().Informer(),
+			kubeInformersForTargetNamespace.Core().V1().ConfigMaps().Informer(),
+			kubeInformersForTargetNamespace.Core().V1().Secrets().Informer())
 
 	return c
 }
@@ -214,6 +215,12 @@ func (c *InstallerController) Run(ctx context.Context, workers int) {
 }
 
 func (c InstallerController) Name() string {
+	return "Installer"
+}
+
+// ControllerInstanceName specifies the controller instance.
+// Useful when the same controller is used multiple times.
+func (c InstallerController) ControllerInstanceName() string {
 	return c.controllerInstanceName
 }
 
diff --git a/pkg/operator/staticpod/controller/startupmonitorcondition/startup_monitor_condition.go b/pkg/operator/staticpod/controller/startupmonitorcondition/startup_monitor_condition.go
@@ -44,6 +44,7 @@ func New(
 	}
 	return factory.New().
 		WithSync(fd.sync).
+		WithControllerInstanceName(fd.controllerInstanceName).
 		ResyncEvery(6*time.Minute).
 		WithInformers(
 			kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Pods().Informer(),
diff --git a/pkg/operator/staticpod/controller/staticpodfallback/static_pod_fallback_condition.go b/pkg/operator/staticpod/controller/staticpodfallback/static_pod_fallback_condition.go
@@ -50,6 +50,7 @@ func New(
 	}
 	return factory.New().
 		WithSync(fd.sync).
+		WithControllerInstanceName(fd.controllerInstanceName).
 		ResyncEvery(6*time.Minute).
 		WithInformers(kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Pods().Informer()).
 		ToController(

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func NewAPIServiceController(`
`70`	`70`	`kubeClient: kubeClient,`
`71`	`71`	`}`
`72`	`72`
`73`		`- return factory.New().WithSync(c.sync).ResyncEvery(10*time.Second).WithInformers(`
	`73`	`+ return factory.New().WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).ResyncEvery(10*time.Second).WithInformers(`
`74`	`74`	`append(informers,`
`75`	`75`	`kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Services().Informer(),`
`76`	`76`	`kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Endpoints().Informer(),`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func NewAuditPolicyController(`
`54`	`54`	`targetConfigMapName: targetConfigMapName,`
`55`	`55`	`}`
`56`	`56`
`57`		`- return factory.New().WithSync(c.sync).ResyncEvery(10*time.Second).WithInformers(`
	`57`	`+ return factory.New().WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).ResyncEvery(10*time.Second).WithInformers(`
`58`	`58`	`configInformers.Config().V1().APIServers().Informer(),`
`59`	`59`	`kubeInformersForTargetNamesace.Core().V1().ConfigMaps().Informer(),`
`60`	`60`	`operatorClient.Informer(),`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ func NewController(instanceName, operatorNamespace, targetNamespace, targetOpera`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`return c.WithSync(controllerRef.sync).`
	`114`	`+ WithControllerInstanceName(controllerRef.controllerInstanceName).`
`114`	`115`	`WithInformers(informers...).`
`115`	`116`	`ToController(`
`116`	`117`	`fmt.Sprintf("%sWorkloadController", controllerRef.controllerInstanceName),`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func (c *DeploymentController) ToController() (factory.Controller, error) {`
`185`	`185`	`c.operatorClient.Informer(),`
`186`	`186`	`c.deployInformer.Informer(),`
`187`	`187`	`)`
`188`		`- controller := factory.New().WithInformers(`
	`188`	`+ controller := factory.New().WithControllerInstanceName(c.controllerInstanceName).WithInformers(`
`189`	`189`	`informers...,`
`190`	`190`	`).WithSync(`
`191`	`191`	`c.sync,`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func NewMigrationController(`
`96`	`96`	`preconditionsFulfilledFn: preconditionsFulfilledFn,`
`97`	`97`	`}`
`98`	`98`
`99`		`- return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithInformers(`
	`99`	`+ return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).WithInformers(`
`100`	`100`	`migrator,`
`101`	`101`	`operatorClient.Informer(),`
`102`	`102`	`kubeInformersForNamespaces.InformersFor("openshift-config-managed").Core().V1().Secrets().Informer(),`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func NewPruneController(`
`70`	`70`	`secretClient: secretClient,`
`71`	`71`	`}`
`72`	`72`
`73`		`- return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithInformers(`
	`73`	`+ return factory.New().ResyncEvery(time.Minute).WithSync(c.sync).WithControllerInstanceName(c.controllerInstanceName).WithInformers(`
`74`	`74`	`operatorClient.Informer(),`
`75`	`75`	`kubeInformersForNamespaces.InformersFor("openshift-config-managed").Core().V1().Secrets().Informer(),`
`76`	`76`	`apiServerConfigInformer.Informer(), // do not remove, used by the precondition checker`