remove two step watch for console config

openshift · Jul 7, 2020 · 072c2b4 · 072c2b4
1 parent 8bb2e80
commit 072c2b4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
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("wat")
 	if errors.IsNotFound(err) {
 		return "", nil
 	}

diff --git a/pkg/operator2/starter.go b/pkg/operator2/starter.go
@@ -149,14 +149,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(