Merge pull request #577 from WASdev/kustomize-deprecate

Remove deprecated keys form kustomize files

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

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

internal/deploy/kustomize/daily/examples/watch-all-namespaces/kustomization.yaml

@@ -3,8 +3,9 @@ kind: Kustomization
 
 namespace: wlo-ns
 
-bases:
-- ../../overlays/watch-all-namespaces
 
-patchesStrategicMerge:
-- wlo-ns.yaml
+resources:
+- ../../overlays/watch-all-namespaces
+patches:
+- path: binding-patch2.yaml
+- path: binding-patch1.yaml

internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-ns2/kustomization.yaml

@@ -2,10 +2,13 @@ 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
+resources:
+- ../../../overlays/watch-another-namespace/wlo-ns
+patches:
+- path: wlo-deployment.yaml
+- path: role-patch1.yaml
+- path: role-patch2.yaml
+- path: role-patch3.yaml
+- path: role-patch4.yaml
+- path: wlo-sa.yaml

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

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

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

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

internal/deploy/kustomize/daily/examples/watch-another-namespace/wlo-watched-ns2/kustomization.yaml

@@ -2,8 +2,11 @@ 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: role-patch1.yaml
+- path: role-patch2.yaml
+- path: role-patch3.yaml
+- path: role-patch4.yaml

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

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

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

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

internal/deploy/kustomize/daily/examples/watch-own-namespace/kustomization.yaml

@@ -3,5 +3,5 @@ kind: Kustomization
 
 namespace: wlo-ns
 
-bases:
+resources:
 - ../../base

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

internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-ns/kustomization.yaml

@@ -2,10 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: wlo-ns
 
-bases:
-- ../../../base
 
-patchesStrategicMerge:
-- wlo-deployment.yaml
-- wlo-roles.yaml
-- wlo-sa.yaml
+resources:
+- ../../../base
+patches:
+- path: wlo-deployment.yaml
+- path: roles-patch1.yaml
+- path: roles-patch2.yaml
+- path: roles-patch3.yaml
+- path: roles-patch4.yaml
+- path: wlo-sa.yaml

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

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

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

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