Fix kustomize deprecations in ci templates

Author: mboersma

templates/test/ci/prow-aks-clusterclass/kustomization.yaml

@@ -2,13 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../../../flavors/aks-clusterclass
-  - ../../../flavors/aks-topology
-patchesStrategicMerge:
-  - patches/tags-aks-clusterclass.yaml
-  - patches/aks-clusterclass-pool0.yaml
-  - patches/aks-clusterclass-pool1.yaml
-  - patches/cluster.yaml
-  - patches/addons.yaml
-  - patches/kubeadm-config-template.yaml
-  - patches.yaml
+- ../../../flavors/aks-clusterclass
+- ../../../flavors/aks-topology
+patches:
+- path: patches/tags-aks-clusterclass.yaml
+- path: patches/aks-clusterclass-pool0.yaml
+- path: patches/aks-clusterclass-pool1.yaml
+- path: patches/cluster.yaml
+- path: patches/addons.yaml
+- path: patches/kubeadm-config-template.yaml
+- path: patches.yaml

templates/test/ci/prow-aks/kustomization.yaml

@@ -2,10 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../../../flavors/aks
-  - patches/aks-pool2.yaml
-patchesStrategicMerge:
-  - ../patches/tags-aks.yaml
-  - patches/aks-pool0.yaml
-  - patches/aks-pool1.yaml
-  - patches/addons.yaml
+- ../../../flavors/aks
+- patches/aks-pool2.yaml
+patches:
+- path: ../patches/tags-aks.yaml
+- path: patches/aks-pool0.yaml
+- path: patches/aks-pool1.yaml
+- path: patches/addons.yaml

templates/test/ci/prow-azure-cni-v1/kustomization.yaml

@@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../../../flavors/azure-cni-v1/
-  - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml
-  - ../../../addons/cluster-api-helm/cloud-provider-azure.yaml
-  - ../../../addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-patchesStrategicMerge:
-  - ../patches/tags.yaml
-  - ../patches/controller-manager.yaml
-  - ../patches/cluster-label-cloud-provider-azure.yaml
+- ../../../flavors/azure-cni-v1/
+- ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml
+- ../../../addons/cluster-api-helm/cloud-provider-azure.yaml
+- ../../../addons/cluster-api-helm/cloud-provider-azure-ci.yaml
+patches:
+- path: ../patches/tags.yaml
+- path: ../patches/controller-manager.yaml
+- path: ../patches/cluster-label-cloud-provider-azure.yaml

templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml

@@ -2,30 +2,29 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../prow-ci-version
-  - ../../../addons/cluster-api-helm/calico-dual-stack.yaml
-patchesStrategicMerge:
-  - ../../../flavors/dual-stack/patches/dual-stack.yaml
-  - ../../../flavors/dual-stack/patches/controlplane-azuremachinetemplate.yaml
-  - ../../../flavors/dual-stack/patches/kubeadm-controlplane.yaml
-  - ../prow-dual-stack/patches/cluster-label-calico-dual-stack.yaml
-  - patches/machine-deployment.yaml
-  - ../patches/windows-addons-disabled.yaml
+- ../prow-ci-version
+- ../../../addons/cluster-api-helm/calico-dual-stack.yaml
 patches:
-  - target:
-      kind: HelmChartProxy
+- patch: |
+    $patch: delete
+    apiVersion: addons.cluster.x-k8s.io/v1alpha1
+    kind: HelmChartProxy
+    metadata:
       name: calico
-    patch: |
-      $patch: delete
-      apiVersion: addons.cluster.x-k8s.io/v1alpha1
-      kind: HelmChartProxy
-      metadata:
-        name: calico
-  - target:
-      name: ".*-win.*"
-    patch: |
-      $patch: delete
-      apiVersion: cluster.x-k8s.io/v1beta1
-      kind: MachineDeployment
-      metadata:
-        name: win
+  target:
+    kind: HelmChartProxy
+    name: calico
+- patch: |
+    $patch: delete
+    apiVersion: cluster.x-k8s.io/v1beta1
+    kind: MachineDeployment
+    metadata:
+      name: win
+  target:
+    name: .*-win.*
+- path: ../../../flavors/dual-stack/patches/dual-stack.yaml
+- path: ../../../flavors/dual-stack/patches/controlplane-azuremachinetemplate.yaml
+- path: ../../../flavors/dual-stack/patches/kubeadm-controlplane.yaml
+- path: ../prow-dual-stack/patches/cluster-label-calico-dual-stack.yaml
+- path: patches/machine-deployment.yaml
+- path: ../patches/windows-addons-disabled.yaml

templates/test/ci/prow-ci-version-ipv6/kustomization.yaml

@@ -2,30 +2,29 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../prow-ci-version
-  - ../../../addons/cluster-api-helm/calico-ipv6.yaml
-patchesStrategicMerge:
-  - ../../../flavors/ipv6/patches/ipv6.yaml
-  - ../../../flavors/ipv6/patches/controlplane-azuremachinetemplate.yaml
-  - ../../../flavors/ipv6/patches/kubeadm-controlplane.yaml
-  - ../prow-ipv6/patches/cluster-label-calico-ipv6.yaml
-  - patches/machine-deployment.yaml
-  - ../patches/windows-addons-disabled.yaml
+- ../prow-ci-version
+- ../../../addons/cluster-api-helm/calico-ipv6.yaml
 patches:
-  - target:
-      kind: HelmChartProxy
+- patch: |
+    $patch: delete
+    apiVersion: addons.cluster.x-k8s.io/v1alpha1
+    kind: HelmChartProxy
+    metadata:
       name: calico
-    patch: |
-      $patch: delete
-      apiVersion: addons.cluster.x-k8s.io/v1alpha1
-      kind: HelmChartProxy
-      metadata:
-        name: calico
-  - target:
-      name: ".*-win.*"
-    patch: |
-      $patch: delete
-      apiVersion: cluster.x-k8s.io/v1beta1
-      kind: MachineDeployment
-      metadata:
-        name: win
+  target:
+    kind: HelmChartProxy
+    name: calico
+- patch: |
+    $patch: delete
+    apiVersion: cluster.x-k8s.io/v1beta1
+    kind: MachineDeployment
+    metadata:
+      name: win
+  target:
+    name: .*-win.*
+- path: ../../../flavors/ipv6/patches/ipv6.yaml
+- path: ../../../flavors/ipv6/patches/controlplane-azuremachinetemplate.yaml
+- path: ../../../flavors/ipv6/patches/kubeadm-controlplane.yaml
+- path: ../prow-ipv6/patches/cluster-label-calico-ipv6.yaml
+- path: patches/machine-deployment.yaml
+- path: ../patches/windows-addons-disabled.yaml

templates/test/ci/prow-ci-version/kustomization.yaml

@@ -2,70 +2,69 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../prow
-  - ../../../addons/metrics-server/metrics-server-resource-set.yaml
-patchesStrategicMerge:
-  - ../patches/control-plane-image-ci-version.yaml
-  - ../patches/controller-manager.yaml
-  - ../patches/windows-feature-gates.yaml
-  - ../patches/windows-containerd-labels.yaml
-  - ../patches/windows-machine-deployment-replicas.yaml
-  - patches/machine-deployment-ci-version.yaml
-  - patches/machine-deployment-ci-version-windows.yaml
-  - ../patches/metrics-server-enabled-cluster.yaml
-  - ../patches/controller-manager-featuregates.yaml
+- ../prow
+- ../../../addons/metrics-server/metrics-server-resource-set.yaml
 patches:
-- target:
+- path: patches/oot-credential-provider.yaml
+  target:
     group: bootstrap.cluster.x-k8s.io
-    version: v1beta1
     kind: KubeadmConfigTemplate
     name: .*-md-0
     namespace: default
-  path: patches/oot-credential-provider.yaml
-- target:
-    group: bootstrap.cluster.x-k8s.io
     version: v1beta1
+- path: patches/oot-credential-provider-win.yaml
+  target:
+    group: bootstrap.cluster.x-k8s.io
     kind: KubeadmConfigTemplate
     name: .*-md-win
     namespace: default
-  path: patches/oot-credential-provider-win.yaml
-- target:
-    group: controlplane.cluster.x-k8s.io
     version: v1beta1
+- path: patches/oot-credential-provider-kcp.yaml
+  target:
+    group: controlplane.cluster.x-k8s.io
     kind: KubeadmControlPlane
     name: .*-control-plane
-  path: patches/oot-credential-provider-kcp.yaml
-- target:
-    group: bootstrap.cluster.x-k8s.io
     version: v1beta1
+- path: patches/kubeadm-bootstrap.yaml
+  target:
+    group: bootstrap.cluster.x-k8s.io
     kind: KubeadmConfigTemplate
     name: .*-md-0
     namespace: default
-  path: patches/kubeadm-bootstrap.yaml
-- target:
-    group: bootstrap.cluster.x-k8s.io
     version: v1beta1
+- path: patches/kubeadm-bootstrap-windows-k8s-ci-binaries.yaml
+  target:
+    group: bootstrap.cluster.x-k8s.io
     kind: KubeadmConfigTemplate
     name: .*-md-win
     namespace: default
-  path: patches/kubeadm-bootstrap-windows-k8s-ci-binaries.yaml
-- target:
-    group: controlplane.cluster.x-k8s.io
     version: v1beta1
+- path: ../patches/control-plane-kubeadm-boostrap-ci-version.yaml
+  target:
+    group: controlplane.cluster.x-k8s.io
     kind: KubeadmControlPlane
     name: .*-control-plane
-  path: ../patches/control-plane-kubeadm-boostrap-ci-version.yaml
+    version: v1beta1
+- path: ../patches/control-plane-image-ci-version.yaml
+- path: ../patches/controller-manager.yaml
+- path: ../patches/windows-feature-gates.yaml
+- path: ../patches/windows-containerd-labels.yaml
+- path: ../patches/windows-machine-deployment-replicas.yaml
+- path: patches/machine-deployment-ci-version.yaml
+- path: patches/machine-deployment-ci-version-windows.yaml
+- path: ../patches/metrics-server-enabled-cluster.yaml
+- path: ../patches/controller-manager-featuregates.yaml
 configMapGenerator:
-  - name: cni-${CLUSTER_NAME}-calico-windows
-    behavior: merge
-    files:
-      - kube-proxy-patch=../patches/windows-kubeproxy-ci.yaml
-  - name: metrics-server-${CLUSTER_NAME}
-    files:
-      - metrics-server=../../../addons/metrics-server/metrics-server.yaml
+- behavior: merge
+  files:
+  - kube-proxy-patch=../patches/windows-kubeproxy-ci.yaml
+  name: cni-${CLUSTER_NAME}-calico-windows
+- files:
+  - metrics-server=../../../addons/metrics-server/metrics-server.yaml
+  name: metrics-server-${CLUSTER_NAME}
 generatorOptions:
+  annotations:
+    note: generated
   disableNameSuffixHash: true
   labels:
     type: generated
-  annotations:
-    note: generated

templates/test/ci/prow-clusterclass-ci-default/kustomization.yaml

@@ -2,13 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../../../flavors/clusterclass/clusterclass.yaml
-  - ../../../flavors/clusterclass/kubeadm-controlplane-template.yaml
-  - ../../../flavors/clusterclass/azure-cluster-template.yaml
-  - ../../../flavors/clusterclass/azure-machine-template-controlplane.yaml
-  - kubeadm-config-template.yaml
-  - windows.yaml
-  - ../../../azure-cluster-identity
-patchesStrategicMerge:
-  - patches.yaml
-  - variables.yaml
+- ../../../flavors/clusterclass/clusterclass.yaml
+- ../../../flavors/clusterclass/kubeadm-controlplane-template.yaml
+- ../../../flavors/clusterclass/azure-cluster-template.yaml
+- ../../../flavors/clusterclass/azure-machine-template-controlplane.yaml
+- kubeadm-config-template.yaml
+- windows.yaml
+- ../../../azure-cluster-identity
+patches:
+- path: patches.yaml
+- path: variables.yaml

templates/test/ci/prow-custom-vnet/kustomization.yaml

@@ -2,18 +2,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../../../flavors/default
-  - ../prow/mhc.yaml
-  - ../../../addons/cluster-api-helm/calico.yaml
-  - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml
-  - ../../../addons/cluster-api-helm/cloud-provider-azure.yaml
-  - ../../../addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-patchesStrategicMerge:
-  - ../patches/tags.yaml
-  - ../patches/mhc.yaml
-  - ../patches/controller-manager.yaml
-  - patches/custom-vnet.yaml
-  - ../patches/uami-md-0.yaml
-  - ../patches/uami-control-plane.yaml
-  - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-cloud-provider-azure.yaml
+- ../../../flavors/default
+- ../prow/mhc.yaml
+- ../../../addons/cluster-api-helm/calico.yaml
+- ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml
+- ../../../addons/cluster-api-helm/cloud-provider-azure.yaml
+- ../../../addons/cluster-api-helm/cloud-provider-azure-ci.yaml
+patches:
+- path: ../patches/tags.yaml
+- path: ../patches/mhc.yaml
+- path: ../patches/controller-manager.yaml
+- path: patches/custom-vnet.yaml
+- path: ../patches/uami-md-0.yaml
+- path: ../patches/uami-control-plane.yaml
+- path: ../patches/cluster-label-calico.yaml
+- path: ../patches/cluster-label-cloud-provider-azure.yaml

templates/test/ci/prow-dual-stack/kustomization.yaml

@@ -2,16 +2,16 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../../../flavors/dual-stack
-  - machine-pool-dualstack.yaml
-  - ../../../addons/cluster-api-helm/calico-dual-stack.yaml
-  - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml
-  - ../../../addons/cluster-api-helm/cloud-provider-azure.yaml
-  - ../../../addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-patchesStrategicMerge:
-  - ../patches/tags.yaml
-  - ../patches/controller-manager.yaml
-  - patches/azure-machine-template-control-plane.yaml
-  - patches/azure-machine-template.yaml
-  - patches/cluster-label-calico-dual-stack.yaml
-  - ../patches/cluster-label-cloud-provider-azure.yaml
+- ../../../flavors/dual-stack
+- machine-pool-dualstack.yaml
+- ../../../addons/cluster-api-helm/calico-dual-stack.yaml
+- ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml
+- ../../../addons/cluster-api-helm/cloud-provider-azure.yaml
+- ../../../addons/cluster-api-helm/cloud-provider-azure-ci.yaml
+patches:
+- path: ../patches/tags.yaml
+- path: ../patches/controller-manager.yaml
+- path: patches/azure-machine-template-control-plane.yaml
+- path: patches/azure-machine-template.yaml
+- path: patches/cluster-label-calico-dual-stack.yaml
+- path: ../patches/cluster-label-cloud-provider-azure.yaml