Merge pull request #5232 from nojnhuh/kustomize-warnings

fix kustomize warnings for deprecated patchesStrategicMerge
kubernetes-sigs · Nov 1, 2024 · bcca2e2 · bcca2e2
2 parents 90d9b4b + fbdbb43
commit bcca2e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/templates/flavors/flatcar-sysext/kustomization.yaml b/templates/flavors/flatcar-sysext/kustomization.yaml
@@ -4,6 +4,6 @@ resources:
   - machine-deployment.yaml
   - ../../azure-cluster-identity
 
-patchesStrategicMerge:
-  - patches/kubeadm-controlplane.yaml
-  - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
+patches:
+  - path: patches/kubeadm-controlplane.yaml
+  - path: ../../azure-cluster-identity/azurecluster-identity-ref.yaml
diff --git a/templates/test/ci/prow-flatcar-sysext/kustomization.yaml b/templates/test/ci/prow-flatcar-sysext/kustomization.yaml
@@ -6,8 +6,8 @@ resources:
   - ../../../addons/cluster-api-helm/calico.yaml
   - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml
   - ../../../addons/cluster-api-helm/cloud-provider-azure-flatcar-sysext.yaml
-patchesStrategicMerge:
-  - ../patches/tags.yaml
-  - ../patches/controller-manager.yaml
-  - ../patches/cluster-label-calico.yaml
-  - ../patches/cluster-label-cloud-provider-azure-flatcar-sysext.yaml
+patches:
+  - path: ../patches/tags.yaml
+  - path: ../patches/controller-manager.yaml
+  - path: ../patches/cluster-label-calico.yaml
+  - path: ../patches/cluster-label-cloud-provider-azure-flatcar-sysext.yaml