core: remove unnecessary param to watch namespaces

Cleanup obsolete code where the context no longer needs
to be passed as a parameter to determine the namespaces
to watch.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit 82c82bbe13)
This commit is contained in:
Travis Nielsen authored and Mergify committed 2025-01-09 06:56:59 +00:00
1 parent 9a985f83a2
commit 02c0e8448d
1 file changed
+3 -3
+3 -3
View File
@@ -131,7 +131,7 @@ func (o *Operator) runCRDManager() {
// The operator config manager is also watching for changes here so if the operator config map
// content changes for ROOK_CURRENT_NAMESPACE_ONLY we must reload the operator CRD manager
o.namespaceToWatch(opManagerContext)
o.namespaceToWatch()
// Pass the parent context to the cluster controller so that the monitoring go routines can
// consume it to terminate gracefully
@@ -148,11 +148,11 @@ func (o *Operator) runCRDManager() {
}()
}
func (o *Operator) namespaceToWatch(context context.Context) {
func (o *Operator) namespaceToWatch() {
currentNamespaceOnly, _ := k8sutil.GetOperatorSetting(opManagerContext, o.context.Clientset, opcontroller.OperatorSettingConfigMapName, "ROOK_CURRENT_NAMESPACE_ONLY", "true")
if currentNamespaceOnly == "true" {
o.config.NamespaceToWatch = o.config.OperatorNamespace
logger.Infof("watching the current namespace %q for a Ceph CRs", o.config.OperatorNamespace)
logger.Infof("watching the current namespace %q for Ceph CRs", o.config.OperatorNamespace)
} else {
o.config.NamespaceToWatch = v1.NamespaceAll
logger.Infof("watching all namespaces for Ceph CRs")