Removed support for env variable to set Cluster Scoped instance namespaces

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

Author: anandf

.github/workflows/ci-build.yaml

@@ -98,8 +98,6 @@ jobs:
         run: |
           go mod download
       - name: Run the operator locally
-        env:
-          ARGOCD_CLUSTER_CONFIG_NAMESPACES: argocd-e2e-cluster-config, argocd-test-impersonation
         run: |
           set -o pipefail
           make install generate fmt vet

Makefile

@@ -177,7 +177,7 @@ e2e: ## Run operator e2e tests
 
 
 start-e2e:
-	ARGOCD_CLUSTER_CONFIG_NAMESPACES="argocd-e2e-cluster-config, argocd-test-impersonation-1-046, argocd-agent-principal-1-051, argocd-agent-agent-1-052, appset-argocd, appset-old-ns, appset-new-ns" make run
+	make run
 
 all: test install run e2e ## UnitTest, Run the operator locally and execute e2e tests.
 

api/v1beta1/clusterargocd_types.go

@@ -17,9 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
-	"github.com/argoproj-labs/argocd-operator/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/argoproj-labs/argocd-operator/common"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -61,15 +62,15 @@ type ClusterArgoCD struct {
 type ClusterArgoCDList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ArgoCD `json:"items"`
+	Items           []ClusterArgoCD `json:"items"`
 }
 
 // ClusterArgoCDSpec defines the desired state of ArgoCD
 // +k8s:openapi-gen=true
 type ClusterArgoCDSpec struct {
 
 	// ControlPlaneNamespace is the target namespace where Argo CD resources would get deployed.
-	ControlPlaneNamespace string `json:"controlPlaneNamespace"`
+	ControlPlaneNamespace string `json:"controlPlaneNamespace,omitempty"`
 
 	// ArgoCDApplicationSet defines whether the Argo CD ApplicationSet controller should be installed.
 	ApplicationSet *ArgoCDApplicationSet `json:"applicationSet,omitempty"`

api/v1beta1/zz_generated.deepcopy.go

@@ -3,14 +3,14 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    control-plane: controller-manager
+    control-plane: argocd-operator
   name: argocd-operator-controller-manager-metrics-service
 spec:
   ports:
   - name: https
     port: 8443
     targetPort: 8080
   selector:
-    control-plane: controller-manager
+    control-plane: argocd-operator
 status:
   loadBalancer: {}

bundle/manifests/argocd-operator-controller-manager-metrics-service_v1_service.yaml

@@ -9,6 +9,6 @@ spec:
     protocol: TCP
     targetPort: 9443
   selector:
-    control-plane: controller-manager
+    control-plane: argocd-operator
 status:
   loadBalancer: {}

bundle/manifests/argocd-operator-webhook-service_v1_service.yaml

@@ -257,7 +257,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2025-11-04T23:03:04Z"
+    createdAt: "2025-12-15T06:59:23Z"
     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
@@ -1910,20 +1910,20 @@ spec:
         serviceAccountName: argocd-operator-controller-manager
       deployments:
       - label:
-          control-plane: controller-manager
+          control-plane: argocd-operator
         name: argocd-operator-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: controller-manager
+              control-plane: argocd-operator
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                control-plane: controller-manager
+                control-plane: argocd-operator
             spec:
               containers:
               - args:

bundle/manifests/argocd-operator.clusterserviceversion.yaml

@@ -8606,8 +8606,10 @@ spec:
                       will be mounted on the ApplicationSet Controller (optional).
                     type: string
                   sourceNamespaces:
-                    description: SourceNamespaces defines the namespaces applicationset
-                      resources are allowed to be created in
+                    description: |-
+                      SourceNamespaces defines the namespaces applicationset resources are allowed to be created in
+                      Deprecated: This field is deprecated for namespace-scoped ArgoCD instances and will be removed in a future release.
+                      Use ClusterArgoCD for cluster-scoped instances that support cross-namespace application management.
                     items:
                       type: string
                     type: array
@@ -10643,8 +10645,10 @@ spec:
                     type: object
                 type: object
               argoCDAgent:
-                description: ArgoCDAgent defines configurations for the ArgoCD Agent
-                  component.
+                description: |-
+                  ArgoCDAgent defines configurations for the ArgoCD Agent component.
+                  Deprecated: This field is deprecated for namespace-scoped ArgoCD instances and will be removed in a future release.
+                  Use ClusterArgoCD for cluster-scoped instances that support cross-namespace application management.
                 properties:
                   agent:
                     description: Agent defines configurations for the Agent component
@@ -17119,9 +17123,10 @@ spec:
                         type: object
                     type: object
                   sourceNamespaces:
-                    description: SourceNamespaces is a list of namespaces from which
-                      the notifications controller will watch for ArgoCD Notification
-                      resources.
+                    description: |-
+                      SourceNamespaces is a list of namespaces from which the notifications controller will watch for ArgoCD Notification resources.
+                      Deprecated: This field is deprecated for namespace-scoped ArgoCD instances and will be removed in a future release.
+                      Use ClusterArgoCD for cluster-scoped instances that support cross-namespace application management.
                     items:
                       type: string
                     type: array
@@ -27774,8 +27779,10 @@ spec:
                     type: array
                 type: object
               sourceNamespaces:
-                description: SourceNamespaces defines the namespaces application resources
-                  are allowed to be created in
+                description: |-
+                  SourceNamespaces defines the namespaces application resources are allowed to be created in
+                  Deprecated: This field is deprecated for namespace-scoped ArgoCD instances and will be removed in a future release.
+                  Use ClusterArgoCD for cluster-scoped instances that support cross-namespace application management.
                 items:
                   type: string
                 type: array

bundle/manifests/argoproj.io_argocds.yaml

@@ -10634,8 +10634,10 @@ spec:
                     type: object
                 type: object
               argoCDAgent:
-                description: ArgoCDAgent defines configurations for the ArgoCD Agent
-                  component.
+                description: |-
+                  ArgoCDAgent defines configurations for the ArgoCD Agent component.
+                  Deprecated: This field is deprecated for namespace-scoped ArgoCD instances and will be removed in a future release.
+                  Use ClusterArgoCD for cluster-scoped instances that support cross-namespace application management.
                 properties:
                   agent:
                     description: Agent defines configurations for the Agent component

config/crd/bases/argoproj.io_argocds.yaml

@@ -2828,6 +2828,10 @@ spec:
                   ConfigManagementPlugins was previously used to specify additional
                   config management plugins.'
                 type: string
+              controlPlaneNamespace:
+                description: ControlPlaneNamespace is the target namespace where Argo
+                  CD resources would get deployed.
+                type: string
               controller:
                 description: Controller defines the Application Controller options
                   for ArgoCD.