feat: Create argocd-cmd-params-cm configMap (argoproj-labs#1756)

Signed-off-by: Rizwana777 <rizwananaaz177@gmail.com>

Author: Rizwana777

api/v1beta1/argocd_types.go

@@ -954,6 +954,9 @@ type ArgoCDSpec struct {
 
 	// AggregatedClusterRoles will allow users to have aggregated ClusterRoles for a cluster scoped instance.
 	AggregatedClusterRoles bool `json:"aggregatedClusterRoles,omitempty"`
+
+	// CmdParams specifies command-line parameters for the Argo CD components.
+	CmdParams map[string]string `json:"cmdParams,omitempty"`
 }
 
 const (

api/v1beta1/zz_generated.deepcopy.go

@@ -247,7 +247,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2025-05-14T11:29:42Z"
+    createdAt: "2025-06-18T07:38:13Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4

bundle/manifests/argocd-operator.clusterserviceversion.yaml

@@ -9651,6 +9651,12 @@ spec:
                 required:
                 - content
                 type: object
+              cmdParams:
+                additionalProperties:
+                  type: string
+                description: CmdParams specifies command-line parameters for the Argo
+                  CD components.
+                type: object
               configManagementPlugins:
                 description: 'Deprecated: ConfigManagementPlugins field is no longer
                   supported. Argo CD now requires plugins to be defined as sidecar

bundle/manifests/argoproj.io_argocds.yaml

@@ -297,6 +297,9 @@ vs-ssh.visualstudio.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOf
 
 	// NotificationsControllerMetricsPort is the port that is used to expose notifications controller metrics.
 	NotificationsControllerMetricsPort = 9001
+
+	// ArgoCDCmdParamsConfigMapName is the upstream hard-coded ArgoCD command params ConfigMap name.
+	ArgoCDCmdParamsConfigMapName = "argocd-cmd-params-cm"
 )
 
 // DefaultLabels returns the default set of labels for controllers.

common/defaults.go

@@ -9640,6 +9640,12 @@ spec:
                 required:
                 - content
                 type: object
+              cmdParams:
+                additionalProperties:
+                  type: string
+                description: CmdParams specifies command-line parameters for the Argo
+                  CD components.
+                type: object
               configManagementPlugins:
                 description: 'Deprecated: ConfigManagementPlugins field is no longer
                   supported. Argo CD now requires plugins to be defined as sidecar

config/crd/bases/argoproj.io_argocds.yaml

@@ -321,6 +321,10 @@ func (r *ReconcileArgoCD) reconcileConfigMaps(cr *argoproj.ArgoCD, useTLSForRedi
 		return err
 	}
 
+	if err := r.reconcileArgoCmdParamsConfigMap(cr); err != nil {
+		return err
+	}
+
 	return r.reconcileGPGKeysConfigMap(cr)
 }
 
@@ -789,3 +793,50 @@ func (r *ReconcileArgoCD) reconcileGPGKeysConfigMap(cr *argoproj.ArgoCD) error {
 	argoutil.LogResourceCreation(log, cm)
 	return r.Client.Create(context.TODO(), cm)
 }
+
+// reconcileArgoCmdParamsConfigMap will ensure that the ConfigMap containing command line parameters for ArgoCD is present.
+func (r *ReconcileArgoCD) reconcileArgoCmdParamsConfigMap(cr *argoproj.ArgoCD) error {
+	cm := newConfigMapWithName(common.ArgoCDCmdParamsConfigMapName, cr)
+	cm.Data = make(map[string]string)
+
+	// Only set data if spec.cmdParams is defined
+	if len(cr.Spec.CmdParams) > 0 {
+		for k, v := range cr.Spec.CmdParams {
+			cm.Data[k] = v
+		}
+	}
+
+	if err := controllerutil.SetControllerReference(cr, cm, r.Scheme); err != nil {
+		return err
+	}
+	existingCM := &corev1.ConfigMap{}
+	if argoutil.IsObjectFound(r.Client, cr.Namespace, cm.Name, existingCM) {
+		changed := false
+
+		// Compare only if data is being managed
+		if len(cm.Data) > 0 && !reflect.DeepEqual(cm.Data, existingCM.Data) {
+			existingCM.Data = cm.Data
+			changed = true
+		}
+		// Check OwnerReferences
+		var refChanged bool
+		var err error
+		if refChanged, err = modifyOwnerReferenceIfNeeded(cr, existingCM, r.Scheme); err != nil {
+			return err
+		}
+		if refChanged {
+			changed = true
+		}
+		if changed {
+			explanation := "updating data"
+			if refChanged {
+				explanation += ", owner reference"
+			}
+			argoutil.LogResourceUpdate(log, existingCM, explanation)
+			return r.Update(context.TODO(), existingCM)
+		}
+		return nil // Do nothing as there is no change in the configmap.
+	}
+	argoutil.LogResourceCreation(log, cm)
+	return r.Create(context.TODO(), cm)
+}

controllers/argocd/configmap.go

@@ -247,7 +247,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2025-05-14T11:29:42Z"
+    createdAt: "2025-06-18T07:38:13Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4

deploy/olm-catalog/argocd-operator/0.14.0/argocd-operator.v0.14.0.clusterserviceversion.yaml

@@ -9651,6 +9651,12 @@ spec:
                 required:
                 - content
                 type: object
+              cmdParams:
+                additionalProperties:
+                  type: string
+                description: CmdParams specifies command-line parameters for the Argo
+                  CD components.
+                type: object
               configManagementPlugins:
                 description: 'Deprecated: ConfigManagementPlugins field is no longer
                   supported. Argo CD now requires plugins to be defined as sidecar