Replace obsolete patches with patchesStrategicMerge

deepy · deepy · commit 0636e2d3a11c · 2022-08-25T09:28:03.000+02:00
This was made obsolete in v1.0.9 https://github.com/kubernetes-sigs/kustomize/blob/v1.0.9/pkg/types/kustomization.go#L129 And stopped working in v3.0.3 kubernetes-sigs/kustomize#1373
diff --git a/deployments/dsa_plugin/overlays/namespace_kube-system/kustomization.yaml b/deployments/dsa_plugin/overlays/namespace_kube-system/kustomization.yaml
@@ -1,4 +1,4 @@
 bases:
   - ../../base
-patches:
+patchesStrategicMerge:
   - add-namespace-kube-system.yaml
diff --git a/deployments/gpu_plugin/overlays/fractional_resources/kustomization.yaml b/deployments/gpu_plugin/overlays/fractional_resources/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - resource-cluster-role-binding.yaml
   - resource-cluster-role.yaml
   - resource-reader-sa.yaml
-patches:
+patchesStrategicMerge:
   - add-serviceaccount.yaml
   - add-podresource-mount.yaml
-  - add-args.yaml
+  - add-args.yaml
diff --git a/deployments/gpu_plugin/overlays/namespace_kube-system/kustomization.yaml b/deployments/gpu_plugin/overlays/namespace_kube-system/kustomization.yaml
@@ -1,4 +1,4 @@
 bases:
   - ../../base
-patches:
+patchesStrategicMerge:
   - add-namespace-kube-system.yaml
diff --git a/deployments/gpu_plugin/overlays/nfd_labeled_nodes/kustomization.yaml b/deployments/gpu_plugin/overlays/nfd_labeled_nodes/kustomization.yaml
@@ -1,4 +1,4 @@
 bases:
   - ../../base
-patches:
+patchesStrategicMerge:
   - add-nodeselector-intel-gpu.yaml
diff --git a/deployments/qat_plugin/overlays/debug/kustomization.yaml b/deployments/qat_plugin/overlays/debug/kustomization.yaml
@@ -1,5 +1,5 @@
 nameSuffix: -debug
 bases:
 - ../../base
-patches:
+patchesStrategicMerge:
   - add-args.yaml
diff --git a/deployments/qat_plugin/overlays/e2e/kustomization.yaml b/deployments/qat_plugin/overlays/e2e/kustomization.yaml
@@ -5,5 +5,5 @@ commonAnnotations:
 resources:
 - ../sriov_numvfs
 
-patches:
+patchesStrategicMerge:
   - add-args.yaml
diff --git a/deployments/sgx_plugin/overlays/epc-hook-initcontainer/kustomization.yaml b/deployments/sgx_plugin/overlays/epc-hook-initcontainer/kustomization.yaml
@@ -1,4 +1,4 @@
 resources:
   - ../../base
-patches:
+patchesStrategicMerge:
   - add-epc-nfd-initcontainer.yaml
diff --git a/deployments/sgx_plugin/overlays/epc-nfd/kustomization.yaml b/deployments/sgx_plugin/overlays/epc-nfd/kustomization.yaml
@@ -3,5 +3,5 @@ bases:
   - ../../../nfd/overlays/sgx
   - ../../../nfd/overlays/node-feature-rules
   - ../../../sgx_admissionwebhook/overlays/default-with-certmanager
-patches:
+patchesStrategicMerge:
   - add-epc-nfd-initcontainer.yaml
diff --git a/deployments/sgx_plugin/overlays/epc-register/kustomization.yaml b/deployments/sgx_plugin/overlays/epc-register/kustomization.yaml
@@ -4,5 +4,5 @@ namespace: kube-system
 resources:
   - service-account.yaml
   - init-daemonset.yaml
-patches:
+patchesStrategicMerge:
   - add-node-selector.yaml
diff --git a/deployments/vpu_plugin/overlays/namespace_kube-system/kustomization.yaml b/deployments/vpu_plugin/overlays/namespace_kube-system/kustomization.yaml
@@ -1,4 +1,4 @@
 bases:
   - ../../base
-patches:
+patchesStrategicMerge:
   - add-namespace-kube-system.yaml
diff --git a/deployments/vpu_plugin/overlays/xlink/kustomization.yaml b/deployments/vpu_plugin/overlays/xlink/kustomization.yaml
@@ -1,6 +1,6 @@
 bases:
 - ../../base/
-patches:
+patchesStrategicMerge:
 - add_command_args.yaml
 patchesJson6902:
 - target:
