Skip to content

Commit

Permalink
Use unique namespaces in kuttl test 1-036, to avoid conflicts with ot…
Browse files Browse the repository at this point in the history
…her tests

Signed-off-by: Jonathan West <[email protected]>
  • Loading branch information
jgwest committed Dec 17, 2024
1 parent 022b4f4 commit 0300aa1
Show file tree
Hide file tree
Showing 15 changed files with 131 additions and 125 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
argocd.argoproj.io/managed-by-cluster-argocd: default
name: test
argocd.argoproj.io/managed-by-cluster-argocd: default-thirtysix
name: test-thirtysix
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -16,22 +16,22 @@ metadata:
app.kubernetes.io/managed-by: example-argocd
app.kubernetes.io/name: example-argocd
app.kubernetes.io/part-of: argocd
name: example-argocd_test
namespace: test
name: example-argocd_test-thirtysix
namespace: test-thirtysix
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: example-argocd_test
namespace: test
name: example-argocd_test-thirtysix
namespace: test-thirtysix
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: example-argocd_test
name: example-argocd_test-thirtysix
subjects:
- kind: ServiceAccount
name: example-argocd-argocd-server
namespace: default
namespace: default-thirtysix
- kind: ServiceAccount
name: example-argocd-argocd-application-controller
namespace: default
namespace: default-thirtysix
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
apiVersion: v1
kind: Namespace
metadata:
name: test
name: test-thirtysix
---
apiVersion: v1
kind: Namespace
metadata:
labels:
argocd.argoproj.io/managed-by-cluster-argocd: default-thirtysix
name: default-thirtysix
---
apiVersion: argoproj.io/v1beta1
kind: ArgoCD
metadata:
name: example-argocd
namespace: default
namespace: default-thirtysix
spec:
sourceNamespaces:
- test
- test-thirtysix
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
argocd.argoproj.io/managed-by-cluster-argocd: default
name: test-1
argocd.argoproj.io/managed-by-cluster-argocd: default-thirtysix
name: test-thirtysix-1
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -16,25 +16,25 @@ metadata:
app.kubernetes.io/managed-by: example-argocd
app.kubernetes.io/name: example-argocd
app.kubernetes.io/part-of: argocd
name: example-argocd_test
namespace: test
name: example-argocd_test-thirtysix
namespace: test-thirtysix
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: example-argocd_test
namespace: test
name: example-argocd_test-thirtysix
namespace: test-thirtysix
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: example-argocd_test
name: example-argocd_test-thirtysix
subjects:
- kind: ServiceAccount
name: example-argocd-argocd-server
namespace: default
namespace: default-thirtysix
- kind: ServiceAccount
name: example-argocd-argocd-application-controller
namespace: default
namespace: default-thirtysix
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -43,22 +43,22 @@ metadata:
app.kubernetes.io/managed-by: example-argocd
app.kubernetes.io/name: example-argocd
app.kubernetes.io/part-of: argocd
name: example-argocd_test-1
namespace: test-1
name: example-argocd_test-thirtysix-1
namespace: test-thirtysix-1
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: example-argocd_test-1
namespace: test-1
name: example-argocd_test-thirtysix-1
namespace: test-thirtysix-1
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: example-argocd_test-1
name: example-argocd_test-thirtysix-1
subjects:
- kind: ServiceAccount
name: example-argocd-argocd-server
namespace: default
namespace: default-thirtysix
- kind: ServiceAccount
name: example-argocd-argocd-application-controller
namespace: default
namespace: default-thirtysix
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ metadata:
app.kubernetes.io/name: example-argocd
app.kubernetes.io/part-of: argocd
name: example-argocd_dev
namespace: dev
namespace: dev-thirtysix
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: example-argocd_dev
namespace: dev
namespace: dev-thirtysix
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: example-argocd_test
subjects:
- kind: ServiceAccount
name: example-argocd-argocd-server
namespace: default
namespace: default-thirtysix
- kind: ServiceAccount
name: example-argocd-argocd-application-controller
namespace: default
namespace: default-thirtysix
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
apiVersion: v1
kind: Namespace
metadata:
name: test-1
name: test-thirtysix-1
---
apiVersion: v1
kind: Namespace
metadata:
name: dev
name: dev-thirtysix
---
apiVersion: argoproj.io/v1beta1
kind: ArgoCD
metadata:
name: example-argocd
namespace: default
namespace: default-thirtysix
spec:
sourceNamespaces:
- test*
- test-thirtysix*
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
argocd.argoproj.io/managed-by-cluster-argocd: default
name: test-2
argocd.argoproj.io/managed-by-cluster-argocd: default-thirtysix
name: test-thirtysix-2
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -16,22 +16,22 @@ metadata:
app.kubernetes.io/managed-by: example-argocd
app.kubernetes.io/name: example-argocd
app.kubernetes.io/part-of: argocd
name: example-argocd_test-2
namespace: test-2
name: example-argocd_test-thirtysix-2
namespace: test-thirtysix-2
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: example-argocd_test-2
namespace: test-2
name: example-argocd_test-thirtysix-2
namespace: test-thirtysix-2
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: example-argocd_test-2
name: example-argocd_test-thirtysix-2
subjects:
- kind: ServiceAccount
name: example-argocd-argocd-server
namespace: default
namespace: default-thirtysix
- kind: ServiceAccount
name: example-argocd-argocd-application-controller
namespace: default
namespace: default-thirtysix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: test-2
name: test-thirtysix-2
Loading

0 comments on commit 0300aa1

Please sign in to comment.