Add missing fetch of configuration ConfigMap in newArgoCD

Author: sector2000

internal/controller/argo.go

@@ -26,6 +26,7 @@ import (
 	"strings"
 
 	v1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -56,7 +57,18 @@ const (
 	ConsoleLinkResource = "consolelinks"
 )
 
-func newArgoCD(name, namespace string) *argooperator.ArgoCD {
+func newArgoCD(r kubernetes.Interface, name, namespace string) (*argooperator.ArgoCD, error) {
+	// Check if the config map exists and read the config map values
+	cm, err := r.CoreV1().ConfigMaps(DetectOperatorNamespace()).Get(context.Background(), OperatorConfigMap, metav1.GetOptions{})
+	// If we hit an error that is not related to the configmap not existing bubble it up
+	if err != nil && !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	if cm != nil {
+		PatternsOperatorConfig = cm.Data
+	}
+
 	argoPolicy := `g, system:cluster-admins, role:admin
 g, cluster-admins, role:admin
 g, admin, role:admin`
@@ -425,7 +437,7 @@ return health_status`,
 			},
 		},
 	}
-	return &s
+	return &s, nil
 }
 
 func haveArgo(client dynamic.Interface, name, namespace string) bool {
@@ -435,7 +447,10 @@ func haveArgo(client dynamic.Interface, name, namespace string) bool {
 }
 
 func createOrUpdateArgoCD(client dynamic.Interface, fullClient kubernetes.Interface, name, namespace string) error {
-	argo := newArgoCD(name, namespace)
+	argo, errArgo := newArgoCD(fullClient, name, namespace)
+	if errArgo != nil {
+		return fmt.Errorf("failed to get ArgoCD object: %v", errArgo)
+	}
 	gvr := schema.GroupVersionResource{Group: ArgoCDGroup, Version: ArgoCDVersion, Resource: ArgoCDResource}
 
 	var err error