Fix kustomize deprecations in flavors and addons

mboersma · mboersma · commit ce86cd76b963 · 2024-04-24T08:53:31.000-06:00
diff --git a/templates/addons/azure-cni-v1/kustomization.yaml b/templates/addons/azure-cni-v1/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 resources:
-  - https://raw.githubusercontent.com/Azure/azure-container-networking/4034aad0d7085f2a9e96cce6d2b50b81ea9ec900/hack/manifests/cni-installer-v1.yaml
+- https://raw.githubusercontent.com/Azure/azure-container-networking/4034aad0d7085f2a9e96cce6d2b50b81ea9ec900/hack/manifests/cni-installer-v1.yaml
diff --git a/templates/addons/calico-dual-stack/kustomization.yaml b/templates/addons/calico-dual-stack/kustomization.yaml
@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-    - ../calico-ipv6
-patchesStrategicMerge:
-    - patches/calico-config.yaml
+- ../calico-ipv6
+patches:
+- path: patches/calico-config.yaml
diff --git a/templates/addons/calico-ipv6/kustomization.yaml b/templates/addons/calico-ipv6/kustomization.yaml
@@ -1,20 +1,19 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-    - calico-policy-only.yaml
-patchesStrategicMerge:
-    - patches/azure-mtu.yaml
-    - patches/calico-config.yaml
+- calico-policy-only.yaml
 patches:
-- target: 
+- path: patches/calico-node.yaml
+  target:
     group: apps
-    version: v1
     kind: DaemonSet
     name: calico-node
     namespace: kube-system
-  path: patches/calico-node.yaml
+    version: v1
 - path: patches/control-plane-tolerations.yaml
   target:
     kind: Deployment
     name: calico-kube-controllers
     namespace: kube-system
+- path: patches/azure-mtu.yaml
+- path: patches/calico-config.yaml
diff --git a/templates/addons/calico/kustomization.yaml b/templates/addons/calico/kustomization.yaml
@@ -1,9 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-    - calico-vxlan.yaml
-patchesStrategicMerge:
-    - patches/azure-mtu.yaml
+- calico-vxlan.yaml
 patches:
 - path: patches/calico-node.yaml
   target:
@@ -13,3 +11,4 @@ patches:
     kind: Deployment
     name: calico-kube-controllers
     namespace: kube-system
+- path: patches/azure-mtu.yaml
diff --git a/templates/addons/metrics-server/kustomization.yaml b/templates/addons/metrics-server/kustomization.yaml
@@ -2,14 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kube-system
 resources:
-  - https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/components.yaml
-patchesStrategicMerge:
-  - patches/control-plane-toleration.yaml
+- https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/components.yaml
 patches:
-- target:
+- path: patches/temp-use-insecure-https.yaml
+  target:
     group: apps
-    version: v1
     kind: Deployment
     name: metrics-server
     namespace: kube-system
-  path: patches/temp-use-insecure-https.yaml
+    version: v1
+- path: patches/control-plane-toleration.yaml
diff --git a/templates/flavors/aad/kustomization.yaml b/templates/flavors/aad/kustomization.yaml
@@ -1,8 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../base
-  - machine-deployment.yaml
-  - ../../azure-cluster-identity
-patchesStrategicMerge:
-  - patches/kubeadm-controlplane.yaml
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+- ../base
+- machine-deployment.yaml
+- ../../azure-cluster-identity
+patches:
+- path: patches/kubeadm-controlplane.yaml
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
diff --git a/templates/flavors/aks/kustomization.yaml b/templates/flavors/aks/kustomization.yaml
@@ -4,5 +4,5 @@ namespace: default
 resources:
 - cluster-template.yaml
 - ../../azure-cluster-identity
-patchesStrategicMerge:
-- ../../azure-cluster-identity/managedazurecluster-identity-ref.yaml
+patches:
+- path: ../../azure-cluster-identity/managedazurecluster-identity-ref.yaml
diff --git a/templates/flavors/azure-bastion/kustomization.yaml b/templates/flavors/azure-bastion/kustomization.yaml
@@ -1,5 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../default
-patchesStrategicMerge:
-  - patches/azure-cluster.yaml
+- ../default
+patches:
+- path: patches/azure-cluster.yaml
diff --git a/templates/flavors/azure-cni-v1/kustomization.yaml b/templates/flavors/azure-cni-v1/kustomization.yaml
@@ -1,9 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../default
-patchesStrategicMerge:
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
-  - patches/azure-machine-template-controlplane.yaml
-  - patches/azure-machine-template.yaml
-  - patches/kubeadm-control-plane.yaml
-  - patches/kubeadm-worker-node.yaml
+- ../default
+patches:
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: patches/azure-machine-template-controlplane.yaml
+- path: patches/azure-machine-template.yaml
+- path: patches/kubeadm-control-plane.yaml
+- path: patches/kubeadm-worker-node.yaml
diff --git a/templates/flavors/base/kustomization.yaml b/templates/flavors/base/kustomization.yaml
@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - cluster-template.yaml
+- cluster-template.yaml
diff --git a/templates/flavors/clusterclass/kustomization.yaml b/templates/flavors/clusterclass/kustomization.yaml
@@ -1,9 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - clusterclass.yaml
-  - azure-cluster-template.yaml
-  - azure-machine-template-controlplane.yaml
-  - azure-machine-template-worker.yaml
-  - kubeadm-controlplane-template.yaml
-  - kubeadm-config-template.yaml
-  - ../../azure-cluster-identity
+- clusterclass.yaml
+- azure-cluster-template.yaml
+- azure-machine-template-controlplane.yaml
+- azure-machine-template-worker.yaml
+- kubeadm-controlplane-template.yaml
+- kubeadm-config-template.yaml
+- ../../azure-cluster-identity
diff --git a/templates/flavors/default/kustomization.yaml b/templates/flavors/default/kustomization.yaml
@@ -1,8 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../base
-  - machine-deployment.yaml
-  - ../../azure-cluster-identity
-
-patchesStrategicMerge:
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+- ../base
+- machine-deployment.yaml
+- ../../azure-cluster-identity
+patches:
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
diff --git a/templates/flavors/dual-stack/kustomization.yaml b/templates/flavors/dual-stack/kustomization.yaml
@@ -1,11 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../base
-  - ../../azure-cluster-identity
-  - machine-deployment.yaml
-
-patchesStrategicMerge:
-  - patches/dual-stack.yaml
-  - patches/kubeadm-controlplane.yaml
-  - patches/controlplane-azuremachinetemplate.yaml
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+- ../base
+- ../../azure-cluster-identity
+- machine-deployment.yaml
+patches:
+- path: patches/dual-stack.yaml
+- path: patches/kubeadm-controlplane.yaml
+- path: patches/controlplane-azuremachinetemplate.yaml
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
diff --git a/templates/flavors/edgezone/kustomization.yaml b/templates/flavors/edgezone/kustomization.yaml
@@ -1,7 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../default
-
-patchesStrategicMerge:
-  - patches/azure-extendedlocation.yaml
-  - patches/azure-remove-natgateway.yaml
+- ../default
+patches:
+- path: patches/azure-extendedlocation.yaml
+- path: patches/azure-remove-natgateway.yaml
diff --git a/templates/flavors/ephemeral/kustomization.yaml b/templates/flavors/ephemeral/kustomization.yaml
@@ -1,17 +1,18 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../default
-
+- ../default
 patches:
 - path: patches/ephemeral.yaml
   target:
     group: infrastructure.cluster.x-k8s.io
-    version: v1beta1
     kind: AzureMachineTemplate
-    name: ".*-md-0"
+    name: .*-md-0
+    version: v1beta1
 - path: patches/ephemeral.yaml
   target:
     group: infrastructure.cluster.x-k8s.io
-    version: v1beta1
     kind: AzureMachineTemplate
-    name: ".*-control-plane"
+    name: .*-control-plane
+    version: v1beta1
diff --git a/templates/flavors/flatcar/kustomization.yaml b/templates/flavors/flatcar/kustomization.yaml
@@ -1,9 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../base
-  - machine-deployment.yaml
-  - ../../azure-cluster-identity
-
-patchesStrategicMerge:
-  - patches/kubeadm-controlplane.yaml
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+- ../base
+- machine-deployment.yaml
+- ../../azure-cluster-identity
+patches:
+- path: patches/kubeadm-controlplane.yaml
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
diff --git a/templates/flavors/ipv6/kustomization.yaml b/templates/flavors/ipv6/kustomization.yaml
@@ -1,11 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../base
-  - ../../azure-cluster-identity
-  - machine-deployment.yaml
-
-patchesStrategicMerge:
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
-  - patches/ipv6.yaml
-  - patches/kubeadm-controlplane.yaml
-  - patches/controlplane-azuremachinetemplate.yaml
+- ../base
+- ../../azure-cluster-identity
+- machine-deployment.yaml
+patches:
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: patches/ipv6.yaml
+- path: patches/kubeadm-controlplane.yaml
+- path: patches/controlplane-azuremachinetemplate.yaml
diff --git a/templates/flavors/machinepool-windows/kustomization.yaml b/templates/flavors/machinepool-windows/kustomization.yaml
@@ -1,7 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../machinepool
-  - machine-pool-deployment-windows.yaml
-
-patchesStrategicMerge:
-  - ../base-windows-containerd/cluster.yaml
+- ../machinepool
+- machine-pool-deployment-windows.yaml
+patches:
+- path: ../base-windows-containerd/cluster.yaml
diff --git a/templates/flavors/machinepool/kustomization.yaml b/templates/flavors/machinepool/kustomization.yaml
@@ -1,8 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../base
-  - machine-pool-deployment.yaml
-  - ../../azure-cluster-identity
-
-patchesStrategicMerge:
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+- ../base
+- machine-pool-deployment.yaml
+- ../../azure-cluster-identity
+patches:
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
diff --git a/templates/flavors/nvidia-gpu/kustomization.yaml b/templates/flavors/nvidia-gpu/kustomization.yaml
@@ -1,15 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../base
-  - ../../azure-cluster-identity
-  - machine-deployment.yaml
-
-patchesStrategicMerge:
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
-
+- ../base
+- ../../azure-cluster-identity
+- machine-deployment.yaml
 generatorOptions:
+  annotations:
+    note: generated
   disableNameSuffixHash: true
   labels:
     type: generated
-  annotations:
-    note: generated
+patches:
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
diff --git a/templates/flavors/private/kustomization.yaml b/templates/flavors/private/kustomization.yaml
@@ -1,12 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../base
-  - ../default/machine-deployment.yaml
-  - ../../azure-cluster-identity
-
-patchesStrategicMerge:
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
-  - patches/private-lb.yaml
-  - patches/apiserver-host-dns.yaml
-  - patches/azure-bastion.yaml
-
+- ../base
+- ../default/machine-deployment.yaml
+- ../../azure-cluster-identity
+patches:
+- path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: patches/private-lb.yaml
+- path: patches/apiserver-host-dns.yaml
+- path: patches/azure-bastion.yaml
diff --git a/templates/flavors/topology/kustomization.yaml b/templates/flavors/topology/kustomization.yaml
@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-- cluster.yaml
+- cluster.yaml
diff --git a/templates/flavors/windows/kustomization.yaml b/templates/flavors/windows/kustomization.yaml
@@ -1,8 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: default
 resources:
-  - ../default
-  - machine-deployment-windows.yaml
-
-patchesStrategicMerge:
-  - ../base-windows-containerd/cluster.yaml
-
+- ../default
+- machine-deployment-windows.yaml
+patches:
+- path: ../base-windows-containerd/cluster.yaml
diff --git a/templates/test/ci/prow/kustomization.yaml b/templates/test/ci/prow/kustomization.yaml
