remove two step watch for console config

openshift · Jul 8, 2020 · ced98a2 · ced98a2
1 parent 8bb2e80
commit ced98a2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/pkg/controllers/configobservation/configobservercontroller/observe_config_controller.go b/pkg/controllers/configobservation/configobservercontroller/observe_config_controller.go
@@ -28,6 +28,7 @@ func NewConfigObserver(
 	interestingNamespaces := []string{
 		"openshift-authentication",
 		"openshift-config",
+		"openshift-config-managed",
 	}
 
 	preRunCacheSynced := []cache.InformerSynced{

diff --git a/pkg/controllers/configobservation/oauth/template_conversions.go b/pkg/controllers/configobservation/oauth/template_conversions.go
@@ -82,7 +82,7 @@ func convertTemplatesWithBranding(cmLister corelistersv1.ConfigMapLister, config
 }
 
 func getConsoleBranding(cmLister corelistersv1.ConfigMapLister) (string, error) {
-	cm, err := cmLister.ConfigMaps("openshift-authentication").Get("v4-0-config-system-console-config")
+	cm, err := cmLister.ConfigMaps("openshift-config-managed").Get("console-config")
 	if errors.IsNotFound(err) {
 		return "", nil
 	}

diff --git a/pkg/operator2/starter.go b/pkg/operator2/starter.go
@@ -71,9 +71,10 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 	}
 
 	kubeInformersNamespaced := v1helpers.NewKubeInformersForNamespaces(kubeClient,
+		"kube-system",
 		"openshift-authentication",
 		"openshift-config",
-		"kube-system",
+		"openshift-config-managed",
 	)
 
 	// short resync period as this drives the check frequency when checking the .well-known endpoint. 20 min is too slow for that.
@@ -149,14 +150,6 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 		return err
 	}
 
-	// add syncing for the console-config ConfigMap (indirect watch for changes)
-	if err := resourceSyncer.SyncConfigMap(
-		resourcesynccontroller.ResourceLocation{Namespace: "openshift-authentication", Name: "v4-0-config-system-console-config"},
-		resourcesynccontroller.ResourceLocation{Namespace: "openshift-config-managed", Name: "console-config"},
-	); err != nil {
-		return err
-	}
-
 	versionGetter := status.NewVersionGetter()
 
 	operator := NewAuthenticationOperator(