Fix merge conflicts 3

Signed-off-by: Rizwana777 <[email protected]>

Author: Rizwana777

bundle/manifests/argocd-operator.clusterserviceversion.yaml

@@ -257,7 +257,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2025-05-14T11:29:42Z"
+    createdAt: "2025-05-15T16:10:29Z"
     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

config/crd/bases/argoproj.io_namespacemanagements.yaml

@@ -1,25 +1,9 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> 49a050d (Fix merge conflicts)
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-<<<<<<< HEAD
-<<<<<<< HEAD
     controller-gen.kubebuilder.io/version: v0.14.0
-=======
-    controller-gen.kubebuilder.io/version: v0.6.1
-  creationTimestamp: null
->>>>>>> 49a050d (Fix merge conflicts)
-=======
-    controller-gen.kubebuilder.io/version: v0.14.0
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
   name: namespacemanagements.argoproj.io
 spec:
   group: argoproj.io
@@ -37,16 +21,11 @@ spec:
           API
         properties:
           apiVersion:
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
             description: |-
               APIVersion defines the versioned schema of this representation of an object.
               Servers should convert recognized schemas to the latest internal value, and
               may reject unrecognized values.
               More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-<<<<<<< HEAD
             type: string
           kind:
             description: |-
@@ -55,26 +34,6 @@ spec:
               Cannot be updated.
               In CamelCase.
               More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-=======
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
->>>>>>> 49a050d (Fix merge conflicts)
-=======
-            type: string
-          kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
             type: string
           metadata:
             type: object
@@ -94,10 +53,6 @@ spec:
                   conditions
                 items:
                   description: "Condition contains details for one aspect of the current
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
                     state of this API Resource.\n---\nThis struct is intended for
                     direct use as an array at the field path .status.conditions.  For
                     example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
@@ -107,38 +62,6 @@ spec:
                     \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
                     patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
                     \   // other fields\n\t}"
-<<<<<<< HEAD
-                  properties:
-                    lastTransitionTime:
-                      description: |-
-                        lastTransitionTime is the last time the condition transitioned from one status to another.
-                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
-                      format: date-time
-                      type: string
-                    message:
-                      description: |-
-                        message is a human readable message indicating details about the transition.
-                        This may be an empty string.
-                      maxLength: 32768
-                      type: string
-                    observedGeneration:
-                      description: |-
-                        observedGeneration represents the .metadata.generation that the condition was set based upon.
-                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
-                        with respect to the current state of the instance.
-=======
-                    state of this API Resource. --- This struct is intended for direct
-                    use as an array at the field path .status.conditions.  For example,
-                    \n \ttype FooStatus struct{ \t    // Represents the observations
-                    of a foo's current state. \t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\" \t    //
-                    +patchMergeKey=type \t    // +patchStrategy=merge \t    // +listType=map
-                    \t    // +listMapKey=type \t    Conditions []metav1.Condition
-                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
-                    protobuf:\"bytes,1,rep,name=conditions\"` \n \t    // other fields
-                    \t}"
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -153,42 +76,19 @@ spec:
                       maxLength: 32768
                       type: string
                     observedGeneration:
-<<<<<<< HEAD
-                      description: observedGeneration represents the .metadata.generation
-                        that the condition was set based upon. For instance, if .metadata.generation
-                        is currently 12, but the .status.conditions[x].observedGeneration
-                        is 9, the condition is out of date with respect to the current
-                        state of the instance.
->>>>>>> 49a050d (Fix merge conflicts)
-=======
                       description: |-
                         observedGeneration represents the .metadata.generation that the condition was set based upon.
                         For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
                         with respect to the current state of the instance.
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
                       format: int64
                       minimum: 0
                       type: integer
                     reason:
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
                       description: |-
                         reason contains a programmatic identifier indicating the reason for the condition's last transition.
                         Producers of specific condition types may define expected values and meanings for this field,
                         and whether the values are considered a guaranteed API.
                         The value should be a CamelCase string.
-<<<<<<< HEAD
-=======
-                      description: reason contains a programmatic identifier indicating
-                        the reason for the condition's last transition. Producers
-                        of specific condition types may define expected values and
-                        meanings for this field, and whether the values are considered
-                        a guaranteed API. The value should be a CamelCase string.
->>>>>>> 49a050d (Fix merge conflicts)
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
                         This field may not be empty.
                       maxLength: 1024
                       minLength: 1
@@ -202,26 +102,12 @@ spec:
                       - Unknown
                       type: string
                     type:
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
                       description: |-
                         type of condition in CamelCase or in foo.example.com/CamelCase.
                         ---
                         Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
                         useful (see .node.status.conditions), the ability to deconflict is important.
                         The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
-<<<<<<< HEAD
-=======
-                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                        --- Many .condition.type values are consistent across resources
-                        like Available, but because arbitrary conditions can be useful
-                        (see .node.status.conditions), the ability to deconflict is
-                        important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
->>>>>>> 49a050d (Fix merge conflicts)
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string
@@ -239,15 +125,3 @@ spec:
     storage: true
     subresources:
       status: {}
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
->>>>>>> 49a050d (Fix merge conflicts)
-=======
->>>>>>> f0cd5b4 (Fix merge conflicts 2)

controllers/argocd/namespaceManagement_test.go

@@ -305,7 +305,6 @@ func TestReconcileNamespaceManagement_DeduplicateNamespaces(t *testing.T) {
 			{Name: "ns-1", AllowManagedBy: true},
 		}
 	})
-	testClient := testclient.NewSimpleClientset()
 
 	nm := &argoproj.NamespaceManagement{
 		ObjectMeta: metav1.ObjectMeta{

controllers/argocd/secret_test.go

@@ -578,97 +578,6 @@ func TestGenerateSortedManagedNamespaceListForArgoCDCR(t *testing.T) {
 
 	assert.NoError(t, createNamespace(r, a.Namespace, ""))
 
-	// 1) The result of call should include both 'my-managed-namespace' and a.Namespace
-	managedByNamespace := corev1.Namespace{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:   "my-managed-namespace",
-			Labels: map[string]string{common.ArgoCDManagedByLabel: a.Namespace},
-		},
-	}
-	err := cl.Create(context.Background(), &managedByNamespace)
-	assert.NoError(t, err)
-
-	res, err := generateSortedManagedNamespaceListForArgoCDCR(a, r.Client)
-	assert.NoError(t, err)
-	assert.Equal(t, res, []string{a.Namespace, managedByNamespace.Name})
-
-	// 2) Ensure that results returned by this function are sorted by namespace name
-	err = cl.Delete(context.Background(), &managedByNamespace)
-	assert.NoError(t, err)
-
-	managedByNamespace = corev1.Namespace{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:   "aaaa-first-when-sorted",
-			Labels: map[string]string{common.ArgoCDManagedByLabel: a.Namespace},
-		},
-	}
-	err = cl.Create(context.Background(), &managedByNamespace)
-	assert.NoError(t, err)
-
-	res, err = generateSortedManagedNamespaceListForArgoCDCR(a, r.Client)
-	assert.NoError(t, err)
-	assert.Equal(t, res, []string{managedByNamespace.Name, a.Namespace})
-
-	// If Namespace management is enabled, fetch from NamespaceManagement CRs
-	// and Ensure that results returned by this function are sorted by namespace name
-	os.Setenv(common.EnableManagedNamespace, "true")
-	defer os.Unsetenv(common.EnableManagedNamespace)
-
-	nsMgmt1 := argoproj.NamespaceManagement{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "namespace-mgmt-1",
-			Namespace: "aaaa-second-when-sorted-nm",
-		},
-		Spec: argoproj.NamespaceManagementSpec{
-			ManagedBy: a.Namespace,
-		},
-	}
-
-	nsMgmt2 := argoproj.NamespaceManagement{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "namespace-mgmt-2",
-			Namespace: "bbbb-third-when-sorted-nm",
-		},
-		Spec: argoproj.NamespaceManagementSpec{
-			ManagedBy: a.Namespace,
-		},
-	}
-
-	err = cl.Create(context.Background(), &nsMgmt1)
-	assert.NoError(t, err)
-	err = cl.Create(context.Background(), &nsMgmt2)
-	assert.NoError(t, err)
-
-	res, err = generateSortedManagedNamespaceListForArgoCDCR(a, r.Client)
-	assert.NoError(t, err)
-	assert.Equal(t, res, []string{managedByNamespace.Name, nsMgmt1.Namespace, a.Namespace, nsMgmt2.Namespace})
-
-}
-
-func TestGenerateSortedManagedNamespaceListForArgoCDCR1(t *testing.T) {
-	logf.SetLogger(ZapLogger(true))
-	a := makeTestArgoCD(func(cr *argoproj.ArgoCD) {
-		cr.Spec.NamespaceManagement = []argoproj.ManagedNamespaces{
-			{
-				Name:           "aaaa-second-when-sorted-nm",
-				AllowManagedBy: true,
-			},
-			{
-				Name:           "bbbb-third-when-sorted-nm",
-				AllowManagedBy: true,
-			},
-		}
-	})
-
-	resObjs := []client.Object{a}
-	subresObjs := []client.Object{a}
-	runtimeObjs := []runtime.Object{}
-	sch := makeTestReconcilerScheme(argoproj.AddToScheme)
-	cl := makeTestReconcilerClient(sch, resObjs, subresObjs, runtimeObjs)
-	r := makeTestReconciler(cl, sch, testclient.NewSimpleClientset())
-
-	assert.NoError(t, createNamespace(r, a.Namespace, ""))
-
 	t.Run("should return default and managedBy namespaces", func(t *testing.T) {
 		ns := corev1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{