Fix kustomize deprecations in e2e test templates

Author: mboersma

test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml

@@ -1,4 +1,6 @@
-bases:
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
 - ../bases/cluster-with-kcp.yaml
 - ../bases/md.yaml
 - mhc.yaml
@@ -7,7 +9,6 @@ bases:
 - ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-
-patchesStrategicMerge:
-- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
+patches:
+- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml

test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml

@@ -1,14 +1,15 @@
-bases:
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
 - ../bases/cluster-with-kcp.yaml
 - ../bases/md.yaml
 - ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
 - ../../../../../../templates/addons/cluster-api-helm/calico.yaml
 - ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-
-patchesStrategicMerge:
-- ./cluster-with-kcp.yaml
-- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
+patches:
+- path: ./cluster-with-kcp.yaml
+- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml

test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml

@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
 - ../bases/cluster-with-kcp.yaml
 - ../bases/mp.yaml
@@ -6,8 +8,7 @@ resources:
 - ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-
-patchesStrategicMerge:
-- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
+patches:
+- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml

test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml

@@ -1,4 +1,6 @@
-bases:
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
 - ../bases/cluster-with-kcp.yaml
 - ../bases/md.yaml
 - mhc.yaml
@@ -7,9 +9,8 @@ bases:
 - ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-
-patchesStrategicMerge:
-- ./md.yaml
-- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
+patches:
+- path: ./md.yaml
+- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml

test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain/kustomization.yaml

@@ -1,15 +1,16 @@
-bases:
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
 - ../bases/cluster-with-kcp.yaml
 - ../bases/md.yaml
 - ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
 - ../../../../../../templates/addons/cluster-api-helm/calico.yaml
 - ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-
-patchesStrategicMerge:
-- ./md.yaml
-- ./cluster-with-kcp.yaml
-- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
+patches:
+- path: ./md.yaml
+- path: ./cluster-with-kcp.yaml
+- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml

test/e2e/data/infrastructure-azure/v1beta1/cluster-template-upgrades/kustomization.yaml

@@ -1,8 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ../bases/cluster-with-kcp.yaml
-  - ../bases/md.yaml
-  - ../bases/mp.yaml
-  - ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
-
-patchesStrategicMerge:
-  - ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
+- ../bases/cluster-with-kcp.yaml
+- ../bases/md.yaml
+- ../bases/mp.yaml
+- ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
+patches:
+- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml

test/e2e/data/infrastructure-azure/v1beta1/cluster-template/kustomization.yaml

@@ -1,13 +1,14 @@
-bases:
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
 - ../bases/cluster-with-kcp.yaml
 - ../bases/md.yaml
 - ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
 - ../../../../../../templates/addons/cluster-api-helm/calico.yaml
 - ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
 - ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
-
-patchesStrategicMerge:
-- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
-- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
+patches:
+- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
+- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml