Remove deprecated keys from kustomize yaml files (#504)

* Remove deprecated kustomize keys

And fix up the patch files, as some kustomozie versions require 1 resource
patch per file

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

@@ -3,9 +3,9 @@ kind: Kustomization
 
 namespace: olo-ns
 
-bases:
-- ../../overlays/watch-all-namespaces
-
-patchesStrategicMerge:
-- olo-ns.yaml
 
+resources:
+- ../../overlays/watch-all-namespaces
+patches:
+- path: role1.yaml
+- path: role2.yaml

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

@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: olo-leader-election-cluster-rolebinding
+subjects:
+- kind: ServiceAccount
+  name: olo-controller-manager
+  namespace: olo-ns

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

@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: olo-manager-cluster-rolebinding
+subjects:
+- kind: ServiceAccount
+  name: olo-controller-manager
+  namespace: olo-ns

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

@@ -2,10 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: olo-ns2
 
-bases:
-- ../../../overlays/watch-another-namespace
 
-patchesStrategicMerge:
-- olo-deployment.yaml
-- olo-roles.yaml
-- olo-sa.yaml
+resources:
+- ../../../overlays/watch-another-namespace
+patches:
+- path: olo-deployment.yaml
+- path: role1.yaml
+- path: role2.yaml
+- path: role3.yaml
+- path: role4.yaml
+- path: olo-sa.yaml

internal/deploy/kustomize/daily/examples/watch-another-namespace/olo-ns2/role1.yaml

@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: olo-leader-election-role
+  namespace: olo-ns

internal/deploy/kustomize/daily/examples/watch-another-namespace/olo-ns2/role2.yaml

@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: olo-manager-role
+  namespace: olo-ns

internal/deploy/kustomize/daily/examples/watch-another-namespace/olo-ns2/role3.yaml

@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: olo-leader-election-rolebinding
+  namespace: olo-ns
+subjects:
+- kind: ServiceAccount
+  name: olo-controller-manager

internal/deploy/kustomize/daily/examples/watch-another-namespace/olo-ns2/role4.yaml

@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: olo-manager-rolebinding
+  namespace: olo-ns
+subjects:
+- kind: ServiceAccount
+  name: olo-controller-manager

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

@@ -2,8 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: olo-watched-ns2
 
-bases:
-- ../../../overlays/watch-another-namespace/olo-watched-ns
 
-patchesStrategicMerge:
-- watched-roles.yaml
+resources:
+- ../../../overlays/watch-another-namespace/olo-watched-ns
+patches:
+- path: role1.yaml
+- path: role2.yaml
+- path: role3.yaml
+- path: role4.yaml

internal/deploy/kustomize/daily/examples/watch-another-namespace/olo-watched-ns2/role1.yaml

@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: olo-watched-role
+  namespace: olo-watched-ns

internal/deploy/kustomize/daily/examples/watch-another-namespace/olo-watched-ns2/role2.yaml

@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: olo-watched-rolebinding
+  namespace: olo-watched-ns
+subjects:
+- kind: ServiceAccount
+  name: olo-controller-manager
+  namespace: olo-ns2

internal/deploy/kustomize/daily/examples/watch-another-namespace/olo-watched-ns2/role3.yaml

@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: olo-leader-election-watched-role
+  namespace: olo-watched-ns

internal/deploy/kustomize/daily/examples/watch-another-namespace/olo-watched-ns2/role4.yaml

@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: olo-leader-election-watched-rolebinding
+  namespace: olo-watched-ns
+subjects:
+- kind: ServiceAccount
+  name: olo-controller-manager
+  namespace: olo-ns2

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

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

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

@@ -3,12 +3,10 @@ kind: Kustomization
 
 namespace: open-liberty
 
-bases:
-- ../../base
 
 resources:
 - cluster-roles.yaml
+- ../../base
 
-patchesStrategicMerge:
-- olo-all-namespaces.yaml
-
+patches:
+- path: olo-all-namespaces.yaml

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

@@ -2,10 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: olo-ns
 
-bases:
-- ../../../base
 
-patchesStrategicMerge:
-- olo-deployment.yaml
-- olo-roles.yaml
-- olo-sa.yaml
+resources:
+- ../../../base
+patches:
+- path: olo-deployment.yaml
+- path: role1.yaml
+- path: role2.yaml
+- path: role3.yaml
+- path: role4.yaml
+- path: olo-sa.yaml

internal/deploy/kustomize/daily/overlays/watch-another-namespace/olo-ns/role1.yaml

@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: olo-leader-election-role
+  namespace: open-liberty

internal/deploy/kustomize/daily/overlays/watch-another-namespace/olo-ns/role2.yaml

@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: olo-manager-role
+  namespace: open-liberty

internal/deploy/kustomize/daily/overlays/watch-another-namespace/olo-ns/role3.yaml

@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: olo-leader-election-rolebinding
+  namespace: open-liberty
+subjects:
+- kind: ServiceAccount
+  name: olo-controller-manager
+  namespace: open-liberty

internal/deploy/kustomize/daily/overlays/watch-another-namespace/olo-ns/role4.yaml

@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: olo-manager-rolebinding
+  namespace: open-liberty
+subjects:
+- kind: ServiceAccount
+  name: olo-controller-manager
+  namespace: open-liberty