Remove deprecated kustomize keys from install files

idlewis · idlewis · commit eba67fbd0cca · 2023-11-10T14:57:53.000Z
And split some patches up to one per file, as this is
required by some versions of kustomize
diff --git 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,9 @@ kind: Kustomization
 
 namespace: rco-ns
 
-bases:
-- ../../overlays/watch-all-namespaces
 
-patchesStrategicMerge:
-- rco-ns.yaml
+resources:
+- ../../overlays/watch-all-namespaces
+patches:
+- path: role1.yaml
+- path: role2.yaml
diff --git a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/rco-ns.yaml b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/rco-ns.yaml
diff --git a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/role1.yaml b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/role1.yaml
@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: rco-leader-election-cluster-rolebinding
+subjects:
+- kind: ServiceAccount
+  name: rco-controller-manager
+  namespace: rco-ns
diff --git a/internal/deploy/kustomize/daily/examples/watch-all-namespaces/role2.yaml b/internal/deploy/kustomize/daily/examples/watch-all-namespaces/role2.yaml
@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: rco-manager-cluster-rolebinding
+subjects:
+- kind: ServiceAccount
+  name: rco-controller-manager
+  namespace: rco-ns
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/kustomization.yaml
@@ -2,10 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: rco-ns2
 
-bases:
-- ../../../overlays/watch-another-namespace/rco-ns
 
-patchesStrategicMerge:
-- rco-deployment.yaml
-- rco-roles.yaml
-- rco-sa.yaml
+resources:
+- ../../../overlays/watch-another-namespace/rco-ns
+patches:
+- path: rco-deployment.yaml
+- path: role1.yaml
+- path: role2.yaml
+- path: role3.yaml
+- path: role4.yaml
+- path: rco-sa.yaml
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/rco-roles.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/rco-roles.yaml
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/role1.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/role1.yaml
@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rco-leader-election-role
+  namespace: rco-ns
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/role2.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/role2.yaml
@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rco-manager-role
+  namespace: rco-ns
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/role3.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/role3.yaml
@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rco-leader-election-rolebinding
+  namespace: rco-ns
+subjects:
+- kind: ServiceAccount
+  name: rco-controller-manager
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/role4.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-ns2/role4.yaml
@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rco-manager-rolebinding
+  namespace: rco-ns
+subjects:
+- kind: ServiceAccount
+  name: rco-controller-manager
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/kustomization.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/kustomization.yaml
@@ -2,8 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: rco-watched-ns2
 
-bases:
-- ../../../overlays/watch-another-namespace/rco-watched-ns
 
-patchesStrategicMerge:
-- watched-roles.yaml
+resources:
+- ../../../overlays/watch-another-namespace/rco-watched-ns
+patches:
+- path: role1.yaml
+- path: role2.yaml
+- path: role3.yaml
+- path: role4.yaml
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/role1.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/role1.yaml
@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rco-watched-role
+  namespace: rco-watched-ns
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/role2.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/role2.yaml
@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rco-watched-rolebinding
+  namespace: rco-watched-ns
+subjects:
+- kind: ServiceAccount
+  name: rco-controller-manager
+  namespace: rco-ns2
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/role3.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/role3.yaml
@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rco-leader-election-watched-role
+  namespace: rco-watched-ns
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/role4.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/role4.yaml
@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rco-leader-election-watched-rolebinding
+  namespace: rco-watched-ns
+subjects:
+- kind: ServiceAccount
+  name: rco-controller-manager
+  namespace: rco-ns2
diff --git a/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/watched-roles.yaml b/internal/deploy/kustomize/daily/examples/watch-another-namespace/rco-watched-ns2/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
@@ -3,6 +3,5 @@ kind: Kustomization
 
 namespace: rco-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
@@ -3,11 +3,10 @@ kind: Kustomization
 
 namespace: runtime-component
 
-bases:
-- ../../base
 
 resources:
 - cluster-roles.yaml
+- ../../base
 
-patchesStrategicMerge:
-- rco-all-namespaces.yaml
+patches:
+- path: rco-all-namespaces.yaml
diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/kustomization.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/kustomization.yaml
@@ -2,10 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: rco-ns
 
-bases:
-- ../../../base
 
-patchesStrategicMerge:
-- rco-deployment.yaml
-- rco-roles.yaml
-- rco-sa.yaml
+resources:
+- ../../../base
+patches:
+- path: rco-deployment.yaml
+- path: roles1.yaml
+- path: roles2.yaml
+- path: roles3.yaml
+- path: roles4.yaml
+- path: rco-sa.yaml
diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/rco-roles.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/rco-roles.yaml
diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/roles1.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/roles1.yaml
@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rco-leader-election-role
+  namespace: runtime-component
diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/roles2.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/roles2.yaml
@@ -0,0 +1,5 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rco-manager-role
+  namespace: runtime-component
diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/roles3.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/roles3.yaml
@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rco-leader-election-rolebinding
+  namespace: runtime-component
+subjects:
+- kind: ServiceAccount
+  name: rco-controller-manager
+  namespace: runtime-component
diff --git a/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/roles4.yaml b/internal/deploy/kustomize/daily/overlays/watch-another-namespace/rco-ns/roles4.yaml
@@ -0,0 +1,9 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rco-manager-rolebinding
+  namespace: runtime-component
+subjects:
+- kind: ServiceAccount
+  name: rco-controller-manager
+  namespace: runtime-component
