Add OAuth metadata CM resource sync

Create the OAuth metadata ConfigMap in the target namespace and
then use the already existing logic to sync it to
openshift-config-managed

Author: stlaz

pkg/operator2/configmap.go

@@ -44,7 +44,7 @@ func getMetadata(route *routev1.Route) string {
 
 func getMetadataConfigMap(route *routev1.Route) *corev1.ConfigMap {
 	meta := defaultMeta()
-	meta.Namespace = machineConfigNamespace
+	meta.Name = oauthMetadataName
 	return &corev1.ConfigMap{
 		ObjectMeta: meta,
 		Data: map[string]string{

pkg/operator2/configsync.go

@@ -12,6 +12,14 @@ import (
 	"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
 )
 
+type SyncResourceType string
+
+const (
+	oauthConfigSyncType SyncResourceType = "oauthconfig"
+	metadataSyncType    SyncResourceType = "oauthmetadata"
+	removeSyncType      SyncResourceType = "removethisdata"
+)
+
 func (c *authOperator) handleConfigSync(data *configSyncData) ([]string, error) {
 	// TODO handle OAuthTemplates
 
@@ -53,15 +61,15 @@ func (c *authOperator) handleConfigSync(data *configSyncData) ([]string, error)
 	inUseSecretNames := sets.NewString()
 
 	for dest, src := range data.idpConfigMaps {
-		syncOrDie(c.resourceSyncer.SyncConfigMap, dest, src.src)
+		syncOrDie(c.resourceSyncer.SyncConfigMap, oauthConfigSyncType, dest, src.src)
 		inUseConfigMapNames.Insert(dest)
 	}
 	for dest, src := range data.idpSecrets {
-		syncOrDie(c.resourceSyncer.SyncSecret, dest, src.src)
+		syncOrDie(c.resourceSyncer.SyncSecret, oauthConfigSyncType, dest, src.src)
 		inUseSecretNames.Insert(dest)
 	}
 	for dest, src := range data.tplSecrets {
-		syncOrDie(c.resourceSyncer.SyncSecret, dest, src.src)
+		syncOrDie(c.resourceSyncer.SyncSecret, oauthConfigSyncType, dest, src.src)
 		inUseSecretNames.Insert(dest)
 	}
 
@@ -72,10 +80,10 @@ func (c *authOperator) handleConfigSync(data *configSyncData) ([]string, error)
 	// it does not really matter, we are talking as worse case of
 	// a few unneeded strings and a few unnecessary deletes
 	for dest := range notInUseConfigMapNames {
-		syncOrDie(c.resourceSyncer.SyncConfigMap, dest, "")
+		syncOrDie(c.resourceSyncer.SyncConfigMap, removeSyncType, dest, "")
 	}
 	for dest := range notInUseSecretNames {
-		syncOrDie(c.resourceSyncer.SyncSecret, dest, "")
+		syncOrDie(c.resourceSyncer.SyncSecret, removeSyncType, dest, "")
 	}
 
 	// only get the resource versions of the elements in use
@@ -88,6 +96,8 @@ func (c *authOperator) handleConfigSync(data *configSyncData) ([]string, error)
 		resourceVersionsInUse = append(resourceVersionsInUse, resourceVersionsAll[name])
 	}
 
+	syncOrDie(c.resourceSyncer.SyncConfigMap, metadataSyncType, oauthMetadataName, targetName)
+
 	return resourceVersionsInUse, nil
 }
 
@@ -243,18 +253,30 @@ func getTemplatePath(name, key string) string {
 	return fmt.Sprintf("%s/%s/%s", userConfigPathPrefixTemplate, name, key)
 }
 
-func syncOrDie(syncFunc func(dest, src resourcesynccontroller.ResourceLocation) error, dest, src string) {
-	ns := userConfigNamespace
-	if len(src) == 0 { // handle delete
-		ns = ""
+func syncOrDie(syncFunc func(dest, src resourcesynccontroller.ResourceLocation) error, t SyncResourceType, dest, src string) {
+	var srcNs, destNs string
+
+	switch t {
+	case oauthConfigSyncType:
+		srcNs = userConfigNamespace
+		destNs = targetName
+	case metadataSyncType:
+		srcNs = targetName
+		destNs = machineConfigNamespace
+	case removeSyncType:
+		srcNs = ""
+		destNs = targetName
+	default:
+		panic("Unknown config sync type")
 	}
+
 	if err := syncFunc(
 		resourcesynccontroller.ResourceLocation{
-			Namespace: targetName,
+			Namespace: destNs,
 			Name:      dest,
 		},
 		resourcesynccontroller.ResourceLocation{
-			Namespace: ns,
+			Namespace: srcNs,
 			Name:      src,
 		},
 	); err != nil {

pkg/operator2/operator.go

@@ -67,6 +67,8 @@ const (
 	cliConfigMount      = systemConfigPathConfigMaps + "/" + cliConfigNameAndKey
 	cliConfigPath       = cliConfigMount + "/" + cliConfigNameAndKey
 
+	oauthMetadataName = systemConfigPrefix + "metadata"
+
 	userConfigPath = "/var/config/user"
 
 	servicePort   = 443

pkg/operator2/starter.go

@@ -112,7 +112,12 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
 		v1helpers.EnsureOperatorConfigExists(dynamicClient, []byte(resource), gvr)
 	}
 
-	resourceSyncerInformers := v1helpers.NewKubeInformersForNamespaces(kubeClient, targetName, userConfigNamespace)
+	resourceSyncerInformers := v1helpers.NewKubeInformersForNamespaces(
+		kubeClient,
+		targetName,
+		userConfigNamespace,
+		machineConfigNamespace,
+	)
 
 	operatorClient := &OperatorClient{
 		authOperatorConfigInformers,