if the configmap already exists, do not error out but continue

Signed-off-by: Charlie Doern <[email protected]>

Author: cdoern

pkg/operator/imageregistrycertificates.go

@@ -32,7 +32,7 @@ type ImageRegistryCertificatesController struct {
 	coreClient                corev1client.CoreV1Interface
 	operatorClient            v1helpers.OperatorClient
 	configMapLister           corev1listers.ConfigMapNamespaceLister
-	configMapManagedLister    corev1listers.ConfigMapNamespaceLister
+	configMapManagedLister    corev1listers.ConfigMapLister
 	serviceLister             corev1listers.ServiceNamespaceLister
 	imageConfigLister         configv1listers.ImageLister
 	openshiftConfigLister     corev1listers.ConfigMapNamespaceLister
@@ -61,7 +61,7 @@ func NewImageRegistryCertificatesController(
 		coreClient:                coreClient,
 		operatorClient:            operatorClient,
 		configMapLister:           configMapInformer.Lister().ConfigMaps(defaults.ImageRegistryOperatorNamespace),
-		configMapManagedLister:    configMapInformer.Lister().ConfigMaps(defaults.OpenShiftConfigManagedNamespace),
+		configMapManagedLister:    openshiftConfigManagedInformer.Lister(),
 		serviceLister:             serviceInformer.Lister().Services(defaults.ImageRegistryOperatorNamespace),
 		imageConfigLister:         imageConfigInformer.Lister(),
 		openshiftConfigLister:     openshiftConfigInformer.Lister().ConfigMaps(defaults.OpenShiftConfigNamespace),
@@ -165,6 +165,7 @@ func (c *ImageRegistryCertificatesController) sync() error {
 	}
 
 	g = resource.NewGeneratorImageRegistryCA(
+		c.configMapLister,
 		c.configMapManagedLister,
 		c.imageConfigLister,
 		c.openshiftConfigLister,

pkg/resource/generator.go

@@ -44,6 +44,7 @@ func ApplyMutator(gen Mutator) error {
 
 			klog.Infof("object %s created: %s", Name(gen), str)
 			return nil
+
 		}
 
 		n, updated, err := gen.Update(o.DeepCopyObject())

pkg/resource/imageregistryca.go

@@ -27,6 +27,7 @@ var _ Mutator = &generatorImageRegistryCA{}
 
 type generatorImageRegistryCA struct {
 	lister                    corelisters.ConfigMapNamespaceLister
+	managedLister             corelisters.ConfigMapLister
 	imageConfigLister         configlisters.ImageLister
 	openshiftConfigLister     corelisters.ConfigMapNamespaceLister
 	serviceLister             corelisters.ServiceNamespaceLister
@@ -38,6 +39,7 @@ type generatorImageRegistryCA struct {
 
 func NewGeneratorImageRegistryCA(
 	lister corelisters.ConfigMapNamespaceLister,
+	managedLister corelisters.ConfigMapLister,
 	imageConfigLister configlisters.ImageLister,
 	openshiftConfigLister corelisters.ConfigMapNamespaceLister,
 	serviceLister corelisters.ServiceNamespaceLister,
@@ -48,6 +50,7 @@ func NewGeneratorImageRegistryCA(
 ) Mutator {
 	return &generatorImageRegistryCA{
 		lister:                    lister,
+		managedLister:             managedLister,
 		imageConfigLister:         imageConfigLister,
 		openshiftConfigLister:     openshiftConfigLister,
 		serviceLister:             serviceLister,
@@ -157,7 +160,7 @@ func (girca *generatorImageRegistryCA) expected() (runtime.Object, error) {
 }
 
 func (girca *generatorImageRegistryCA) Get() (runtime.Object, error) {
-	return girca.lister.Get(girca.GetName())
+	return girca.managedLister.ConfigMaps(defaults.OpenShiftConfigManagedNamespace).Get(girca.GetName())
 }
 
 func (girca *generatorImageRegistryCA) Create() (runtime.Object, error) {