Fix kuttl test

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

tests/k8s/1-037_validate_applicationset_in_any_namespace/02-enable-appset-in-any-ns.yaml

@@ -1,4 +1,4 @@
-# appset resources should be created in target ns
+# appset resources shouldn' be created in target ns as apps in target ns is disabled
 apiVersion: argoproj.io/v1beta1
 kind: ArgoCD
 metadata:

tests/k8s/1-037_validate_applicationset_in_any_namespace/03-add-new-appset-ns.yaml

@@ -1,4 +1,4 @@
-# appset resources should be created in all target namespaces
+# appset resources shouldn't be created as apps in target ns is disabled
 apiVersion: argoproj.io/v1beta1
 kind: ArgoCD
 metadata:

tests/k8s/1-037_validate_applicationset_in_any_namespace/03-assert.yaml → tests/k8s/1-037_validate_applicationset_in_any_namespace/03-errors.yaml

@@ -3,36 +3,12 @@ kind: Role
 metadata:
   name: example_appset-new-ns
   namespace: appset-new-ns
-rules:
-- apiGroups:
-  - argoproj.io
-  resources:
-  - applicationsets
-  verbs:
-  - create
-  - get
-  - list
-  - patch
-  - update
-  - watch
-  - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: example_appset-new-ns
   namespace: appset-new-ns
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: example_appset-new-ns
-subjects:
-- kind: ServiceAccount
-  name: example-argocd-server
-  namespace: appset-argocd
-- kind: ServiceAccount
-  name: example-argocd-application-controller
-  namespace: appset-argocd
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -58,36 +34,12 @@ kind: Role
 metadata:
   name: example_appset-old-ns
   namespace: appset-old-ns
-rules:
-- apiGroups:
-  - argoproj.io
-  resources:
-  - applicationsets
-  verbs:
-  - create
-  - get
-  - list
-  - patch
-  - update
-  - watch
-  - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: example_appset-old-ns
   namespace: appset-old-ns
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: example_appset-old-ns
-subjects:
-- kind: ServiceAccount
-  name: example-argocd-server
-  namespace: appset-argocd
-- kind: ServiceAccount
-  name: example-argocd-application-controller
-  namespace: appset-argocd
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

tests/k8s/1-037_validate_applicationset_in_any_namespace/04-assert.yaml

@@ -7,7 +7,7 @@ rules:
 - apiGroups:
   - argoproj.io
   resources:
-  - applicationsets
+  - applications
   verbs:
   - create
   - get
@@ -16,10 +16,16 @@ rules:
   - update
   - watch
   - delete
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - create
 - apiGroups:
   - argoproj.io
   resources:
-  - applications
+  - applicationsets
   verbs:
   - create
   - get
@@ -65,58 +71,3 @@ metadata:
   labels:
     argocd.argoproj.io/applicationset-managed-by-cluster-argocd: appset-argocd
     argocd.argoproj.io/managed-by-cluster-argocd: appset-argocd
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: example_appset-old-ns
-  namespace: appset-old-ns
-rules:
-- apiGroups:
-  - argoproj.io
-  resources:
-  - applicationsets
-  verbs:
-  - create
-  - get
-  - list
-  - patch
-  - update
-  - watch
-  - delete
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: example_appset-old-ns
-  namespace: appset-old-ns
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: example_appset-old-ns
-subjects:
-- kind: ServiceAccount
-  name: example-argocd-server
-  namespace: appset-argocd
-- kind: ServiceAccount
-  name: example-argocd-application-controller
-  namespace: appset-argocd
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: example-appset-argocd-applicationset
-  namespace: appset-old-ns
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: example-appset-argocd-applicationset
-  namespace: appset-old-ns
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: appset-old-ns
-  labels:
-    argocd.argoproj.io/applicationset-managed-by-cluster-argocd: appset-argocd

tests/k8s/1-037_validate_applicationset_in_any_namespace/04-enable-apps-in-new-ns.yaml

@@ -1,4 +1,4 @@
-# appset resources should be updated to include app-in-any-ns permissions in target appset-new-ns ns
+# appset resources should be created in appset-new-ns namespace as it is subset of sourceNamespaces i.e apps in any ns is enabled on appset-new-ns namespace
 apiVersion: argoproj.io/v1beta1
 kind: ArgoCD
 metadata:

tests/k8s/1-037_validate_applicationset_in_any_namespace/05-errors.yaml → tests/k8s/1-037_validate_applicationset_in_any_namespace/04-errors.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

tests/k8s/1-037_validate_applicationset_in_any_namespace/05-assert.yaml

@@ -1,14 +1,130 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
+metadata:
+  name: example_appset-old-ns
+  namespace: appset-old-ns
+rules:
+- apiGroups:
+  - argoproj.io
+  resources:
+  - applications
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+  - delete
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - create
+- apiGroups:
+  - argoproj.io
+  resources:
+  - applicationsets
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+  - delete
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: example_appset-old-ns
+  namespace: appset-old-ns
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: example_appset-old-ns
+subjects:
+- kind: ServiceAccount
+  name: example-argocd-server
+  namespace: appset-argocd
+- kind: ServiceAccount
+  name: example-argocd-application-controller
+  namespace: appset-argocd
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: example-appset-argocd-applicationset
+  namespace: appset-old-ns
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: example-appset-argocd-applicationset
+  namespace: appset-old-ns
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: appset-old-ns
+  labels:
+    argocd.argoproj.io/applicationset-managed-by-cluster-argocd: appset-argocd
+    argocd.argoproj.io/managed-by-cluster-argocd: appset-argocd
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
 metadata:
   name: example_appset-new-ns
   namespace: appset-new-ns
+rules:
+- apiGroups:
+  - argoproj.io
+  resources:
+  - applications
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+  - delete
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - create
+- apiGroups:
+  - argoproj.io
+  resources:
+  - applicationsets
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+  - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: example_appset-new-ns
   namespace: appset-new-ns
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: example_appset-new-ns
+subjects:
+- kind: ServiceAccount
+  name: example-argocd-server
+  namespace: appset-argocd
+- kind: ServiceAccount
+  name: example-argocd-application-controller
+  namespace: appset-argocd
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -28,3 +144,4 @@ metadata:
   name: appset-new-ns
   labels:
     argocd.argoproj.io/applicationset-managed-by-cluster-argocd: appset-argocd
+    argocd.argoproj.io/managed-by-cluster-argocd: appset-argocd