From 7d3eff4056701989225ea2ef301ff0f795941994 Mon Sep 17 00:00:00 2001 From: ilewis Date: Fri, 3 Nov 2023 10:09:02 +0000 Subject: [PATCH 1/2] Remove deprecated keys from kustomize install files --- .../examples/watch-all-namespaces/kustomization.yaml | 8 ++++---- .../wlo-ns2/kustomization.yaml | 12 ++++++------ .../wlo-watched-ns2/kustomization.yaml | 8 ++++---- .../examples/watch-own-namespace/kustomization.yaml | 2 +- .../overlays/watch-all-namespaces/kustomization.yaml | 7 +++---- .../wlo-ns/kustomization.yaml | 12 ++++++------ 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml index c8ed524d..852d87cd 100644 --- a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml +++ b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml @@ -3,8 +3,8 @@ kind: Kustomization namespace: wlo-ns -bases: -- ../../overlays/watch-all-namespaces -patchesStrategicMerge: -- wlo-ns.yaml +resources: +- ../../overlays/watch-all-namespaces +patches: +- path: wlo-ns.yaml diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml index bec2abaa..afbca46c 100644 --- a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml @@ -2,10 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: wlo-ns2 -bases: -- ../../../overlays/watch-another-namespace/wlo-ns -patchesStrategicMerge: -- wlo-deployment.yaml -- wlo-roles.yaml -- wlo-sa.yaml \ No newline at end of file +resources: +- ../../../overlays/watch-another-namespace/wlo-ns +patches: +- path: wlo-deployment.yaml +- path: wlo-roles.yaml +- path: wlo-sa.yaml diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml index db49b089..610b4e15 100644 --- a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml @@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: wlo-watched-ns2 -bases: -- ../../../overlays/watch-another-namespace/wlo-watched-ns -patchesStrategicMerge: -- watched-roles.yaml +resources: +- ../../../overlays/watch-another-namespace/wlo-watched-ns +patches: +- path: watched-roles.yaml diff --git a/internal/deploy/kustomize/daily/examples/watch-own-namespace/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-own-namespace/kustomization.yaml index 3d4a2f5b..353884d1 100644 --- a/internal/deploy/kustomize/daily/examples/watch-own-namespace/kustomization.yaml +++ b/internal/deploy/kustomize/daily/examples/watch-own-namespace/kustomization.yaml @@ -3,5 +3,5 @@ kind: Kustomization namespace: wlo-ns -bases: +resources: - ../../base diff --git a/internal/deploy/kustomize/daily/overlays/watch-all-namespaces/kustomization.yaml b/internal/deploy/kustomize/daily/overlays/watch-all-namespaces/kustomization.yaml index d1ae464c..a6ae0f44 100644 --- a/internal/deploy/kustomize/daily/overlays/watch-all-namespaces/kustomization.yaml +++ b/internal/deploy/kustomize/daily/overlays/watch-all-namespaces/kustomization.yaml @@ -3,11 +3,10 @@ kind: Kustomization namespace: websphere-liberty -bases: -- ../../base resources: - cluster-roles.yaml +- ../../base -patchesStrategicMerge: -- wlo-all-namespaces.yaml +patches: +- path: wlo-all-namespaces.yaml diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml index f8bf3e4f..f83d0d1b 100644 --- a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml +++ b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml @@ -2,10 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: wlo-ns -bases: -- ../../../base -patchesStrategicMerge: -- wlo-deployment.yaml -- wlo-roles.yaml -- wlo-sa.yaml \ No newline at end of file +resources: +- ../../../base +patches: +- path: wlo-deployment.yaml +- path: wlo-roles.yaml +- path: wlo-sa.yaml From 7dede4b0a3f8f30cecf88299b522e6ffb9033378 Mon Sep 17 00:00:00 2001 From: ilewis Date: Fri, 3 Nov 2023 16:01:05 +0000 Subject: [PATCH 2/2] Split up patches to 1 per file As this is required by some versions of kustomize --- .../watch-all-namespaces/binding-patch1.yaml | 8 +++++ .../watch-all-namespaces/binding-patch2.yaml | 8 +++++ .../watch-all-namespaces/kustomization.yaml | 3 +- .../examples/watch-all-namespaces/wlo-ns.yaml | 19 ------------ .../wlo-ns2/kustomization.yaml | 5 ++- .../wlo-ns2/role-patch1.yaml | 5 +++ .../wlo-ns2/role-patch2.yaml | 5 +++ .../wlo-ns2/role-patch3.yaml | 8 +++++ .../wlo-ns2/role-patch4.yaml | 8 +++++ .../wlo-ns2/wlo-roles.yaml | 29 ----------------- .../wlo-watched-ns2/kustomization.yaml | 5 ++- .../wlo-watched-ns2/role-patch1.yaml | 5 +++ .../wlo-watched-ns2/role-patch2.yaml | 9 ++++++ .../wlo-watched-ns2/role-patch3.yaml | 5 +++ .../wlo-watched-ns2/role-patch4.yaml | 9 ++++++ .../wlo-watched-ns2/watched-roles.yaml | 31 ------------------- .../wlo-ns/kustomization.yaml | 5 ++- .../wlo-ns/roles-patch1.yaml | 5 +++ .../wlo-ns/roles-patch2.yaml | 5 +++ .../wlo-ns/roles-patch3.yaml | 9 ++++++ .../wlo-ns/roles-patch4.yaml | 9 ++++++ .../wlo-ns/wlo-roles.yaml | 31 ------------------- 22 files changed, 112 insertions(+), 114 deletions(-) create mode 100644 internal/deploy/kustomize/daily/examples/watch-all-namespaces/binding-patch1.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-all-namespaces/binding-patch2.yaml delete mode 100644 internal/deploy/kustomize/daily/examples/watch-all-namespaces/wlo-ns.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch1.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch2.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch3.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch4.yaml delete mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/wlo-roles.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch1.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch2.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch3.yaml create mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch4.yaml delete mode 100644 internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/watched-roles.yaml create mode 100644 internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch1.yaml create mode 100644 internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch2.yaml create mode 100644 internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch3.yaml create mode 100644 internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch4.yaml delete mode 100644 internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/wlo-roles.yaml diff --git a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/binding-patch1.yaml b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/binding-patch1.yaml new file mode 100644 index 00000000..121b93e7 --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/binding-patch1.yaml @@ -0,0 +1,8 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: wlo-leader-election-cluster-rolebinding +subjects: +- kind: ServiceAccount + name: websphere-liberty-controller-manager + namespace: wlo-ns diff --git a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/binding-patch2.yaml b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/binding-patch2.yaml new file mode 100644 index 00000000..3a5ac720 --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/binding-patch2.yaml @@ -0,0 +1,8 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: wlo-manager-cluster-rolebinding +subjects: +- kind: ServiceAccount + name: websphere-liberty-controller-manager + namespace: wlo-ns diff --git a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml index 852d87cd..3d8aaf21 100644 --- a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml +++ b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml @@ -7,4 +7,5 @@ namespace: wlo-ns resources: - ../../overlays/watch-all-namespaces patches: -- path: wlo-ns.yaml +- path: binding-patch2.yaml +- path: binding-patch1.yaml diff --git a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/wlo-ns.yaml b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/wlo-ns.yaml deleted file mode 100644 index 4714df89..00000000 --- a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/wlo-ns.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: wlo-leader-election-cluster-rolebinding -subjects: -- kind: ServiceAccount - name: websphere-liberty-controller-manager - namespace: wlo-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: wlo-manager-cluster-rolebinding -subjects: -- kind: ServiceAccount - name: websphere-liberty-controller-manager - namespace: wlo-ns ---- diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml index afbca46c..c19c8f3d 100644 --- a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml @@ -7,5 +7,8 @@ resources: - ../../../overlays/watch-another-namespace/wlo-ns patches: - path: wlo-deployment.yaml -- path: wlo-roles.yaml +- path: role-patch1.yaml +- path: role-patch2.yaml +- path: role-patch3.yaml +- path: role-patch4.yaml - path: wlo-sa.yaml diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch1.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch1.yaml new file mode 100644 index 00000000..6702192d --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch1.yaml @@ -0,0 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: websphere-liberty-leader-election-role + namespace: wlo-ns diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch2.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch2.yaml new file mode 100644 index 00000000..296f3f9d --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch2.yaml @@ -0,0 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: websphere-liberty-manager-role + namespace: wlo-ns diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch3.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch3.yaml new file mode 100644 index 00000000..626c377b --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch3.yaml @@ -0,0 +1,8 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: websphere-liberty-leader-election-rolebinding + namespace: wlo-ns +subjects: +- kind: ServiceAccount + name: websphere-liberty-controller-manager diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch4.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch4.yaml new file mode 100644 index 00000000..e5a56afd --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/role-patch4.yaml @@ -0,0 +1,8 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: websphere-liberty-manager-rolebinding + namespace: wlo-ns +subjects: +- kind: ServiceAccount + name: websphere-liberty-controller-manager diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/wlo-roles.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/wlo-roles.yaml deleted file mode 100644 index 80cada37..00000000 --- a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/wlo-roles.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: websphere-liberty-leader-election-role - namespace: wlo-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: websphere-liberty-manager-role - namespace: wlo-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: websphere-liberty-leader-election-rolebinding - namespace: wlo-ns -subjects: -- kind: ServiceAccount - name: websphere-liberty-controller-manager ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: websphere-liberty-manager-rolebinding - namespace: wlo-ns -subjects: -- kind: ServiceAccount - name: websphere-liberty-controller-manager diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml index 610b4e15..b383b224 100644 --- a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml @@ -6,4 +6,7 @@ namespace: wlo-watched-ns2 resources: - ../../../overlays/watch-another-namespace/wlo-watched-ns patches: -- path: watched-roles.yaml +- path: role-patch1.yaml +- path: role-patch2.yaml +- path: role-patch3.yaml +- path: role-patch4.yaml diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch1.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch1.yaml new file mode 100644 index 00000000..9ac25f4e --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch1.yaml @@ -0,0 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: wlo-watched-role + namespace: wlo-watched-ns diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch2.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch2.yaml new file mode 100644 index 00000000..e9a3ecc8 --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch2.yaml @@ -0,0 +1,9 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: wlo-watched-rolebinding + namespace: wlo-watched-ns +subjects: +- kind: ServiceAccount + name: websphere-liberty-controller-manager + namespace: wlo-ns2 diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch3.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch3.yaml new file mode 100644 index 00000000..40a55304 --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch3.yaml @@ -0,0 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: wlo-leader-election-watched-role + namespace: wlo-watched-ns diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch4.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch4.yaml new file mode 100644 index 00000000..c3dad009 --- /dev/null +++ b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/role-patch4.yaml @@ -0,0 +1,9 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: wlo-leader-election-watched-rolebinding + namespace: wlo-watched-ns +subjects: +- kind: ServiceAccount + name: websphere-liberty-controller-manager + namespace: wlo-ns2 diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/watched-roles.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/watched-roles.yaml deleted file mode 100644 index a7dbc3ba..00000000 --- a/internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/watched-roles.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: wlo-watched-role - namespace: wlo-watched-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: wlo-watched-rolebinding - namespace: wlo-watched-ns -subjects: -- kind: ServiceAccount - name: websphere-liberty-controller-manager - namespace: wlo-ns2 ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: wlo-leader-election-watched-role - namespace: wlo-watched-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: wlo-leader-election-watched-rolebinding - namespace: wlo-watched-ns -subjects: -- kind: ServiceAccount - name: websphere-liberty-controller-manager - namespace: wlo-ns2 diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml index f83d0d1b..3c94bbb0 100644 --- a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml +++ b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml @@ -7,5 +7,8 @@ resources: - ../../../base patches: - path: wlo-deployment.yaml -- path: wlo-roles.yaml +- path: roles-patch1.yaml +- path: roles-patch2.yaml +- path: roles-patch3.yaml +- path: roles-patch4.yaml - path: wlo-sa.yaml diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch1.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch1.yaml new file mode 100644 index 00000000..69ef1bf4 --- /dev/null +++ b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch1.yaml @@ -0,0 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: websphere-liberty-leader-election-role + namespace: websphere-liberty diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch2.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch2.yaml new file mode 100644 index 00000000..742ea76d --- /dev/null +++ b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch2.yaml @@ -0,0 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: websphere-liberty-manager-role + namespace: websphere-liberty diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch3.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch3.yaml new file mode 100644 index 00000000..c0a94306 --- /dev/null +++ b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch3.yaml @@ -0,0 +1,9 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: websphere-liberty-leader-election-rolebinding + namespace: websphere-liberty +subjects: +- kind: ServiceAccount + name: websphere-liberty-controller-manager + namespace: websphere-liberty diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch4.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch4.yaml new file mode 100644 index 00000000..761b6bf4 --- /dev/null +++ b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/roles-patch4.yaml @@ -0,0 +1,9 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: websphere-liberty-manager-rolebinding + namespace: websphere-liberty +subjects: +- kind: ServiceAccount + name: websphere-liberty-controller-manager + namespace: websphere-liberty diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/wlo-roles.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/wlo-roles.yaml deleted file mode 100644 index 8250bfa4..00000000 --- a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/wlo-roles.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: websphere-liberty-leader-election-role - namespace: websphere-liberty ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: websphere-liberty-manager-role - namespace: websphere-liberty ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: websphere-liberty-leader-election-rolebinding - namespace: websphere-liberty -subjects: -- kind: ServiceAccount - name: websphere-liberty-controller-manager - namespace: websphere-liberty ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: websphere-liberty-manager-rolebinding - namespace: websphere-liberty -subjects: -- kind: ServiceAccount - name: websphere-liberty-controller-manager - namespace: websphere-liberty