Merge pull request #1117 from deepy/patches-strategic-merge

bart0sh · web-flow · commit 63476094c94c · 2022-08-26T10:52:58.000+03:00
Replace obsolete patches syntax
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:
-  - add-namespace-kube-system.yaml
+  - path: 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
@@ -5,6 +5,6 @@ resources:
   - resource-cluster-role.yaml
   - resource-reader-sa.yaml
 patches:
-  - add-serviceaccount.yaml
-  - add-podresource-mount.yaml
-  - add-args.yaml
+  - path: add-serviceaccount.yaml
+  - path: add-podresource-mount.yaml
+  - path: 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:
-  - add-namespace-kube-system.yaml
+  - path: 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:
-  - add-nodeselector-intel-gpu.yaml
+  - path: add-nodeselector-intel-gpu.yaml
diff --git a/deployments/qat_plugin/overlays/debug/kustomization.yaml b/deployments/qat_plugin/overlays/debug/kustomization.yaml
@@ -2,4 +2,4 @@ nameSuffix: -debug
 bases:
 - ../../base
 patches:
-  - add-args.yaml
+  - path: add-args.yaml
diff --git a/deployments/qat_plugin/overlays/e2e/kustomization.yaml b/deployments/qat_plugin/overlays/e2e/kustomization.yaml
@@ -6,4 +6,4 @@ resources:
 - ../sriov_numvfs
 
 patches:
-  - add-args.yaml
+  - path: 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:
-  - add-epc-nfd-initcontainer.yaml
+  - path: 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
@@ -4,4 +4,4 @@ bases:
   - ../../../nfd/overlays/node-feature-rules
   - ../../../sgx_admissionwebhook/overlays/default-with-certmanager
 patches:
-  - add-epc-nfd-initcontainer.yaml
+  - path: 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
@@ -5,4 +5,4 @@ resources:
   - service-account.yaml
   - init-daemonset.yaml
 patches:
-  - add-node-selector.yaml
+  - path: 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:
-  - add-namespace-kube-system.yaml
+  - path: 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:
