From 0636e2d3a11c250631b7505746f527ff9a48e250 Mon Sep 17 00:00:00 2001 From: Alex Nordlund Date: Thu, 25 Aug 2022 09:24:59 +0200 Subject: [PATCH 1/2] Replace obsolete patches with patchesStrategicMerge 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 https://github.com/kubernetes-sigs/kustomize/issues/1373 --- .../overlays/namespace_kube-system/kustomization.yaml | 2 +- .../overlays/fractional_resources/kustomization.yaml | 4 ++-- .../overlays/namespace_kube-system/kustomization.yaml | 2 +- .../gpu_plugin/overlays/nfd_labeled_nodes/kustomization.yaml | 2 +- deployments/qat_plugin/overlays/debug/kustomization.yaml | 2 +- deployments/qat_plugin/overlays/e2e/kustomization.yaml | 2 +- .../overlays/epc-hook-initcontainer/kustomization.yaml | 2 +- deployments/sgx_plugin/overlays/epc-nfd/kustomization.yaml | 2 +- .../sgx_plugin/overlays/epc-register/kustomization.yaml | 2 +- .../overlays/namespace_kube-system/kustomization.yaml | 2 +- deployments/vpu_plugin/overlays/xlink/kustomization.yaml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deployments/dsa_plugin/overlays/namespace_kube-system/kustomization.yaml b/deployments/dsa_plugin/overlays/namespace_kube-system/kustomization.yaml index 7d41bcfbe..4b9492a27 100644 --- 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 index 991ddcd5b..b37b95e4f 100644 --- 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 \ No newline at end of file + - 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 index 7d41bcfbe..4b9492a27 100644 --- 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 index f873c3fec..fc12a6af1 100644 --- 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 index f208cdc7a..d18a40a4d 100644 --- 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 index c74763e20..99271b27b 100644 --- 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 index 8dd60c240..dfb3b71a0 100644 --- 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 index 31960f43e..138f3a268 100644 --- 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 index 6727bfae2..dd39f271e 100644 --- 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 index 7d41bcfbe..4b9492a27 100644 --- 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 index f0e8d2748..477825bff 100644 --- 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: From 79986a6096ec22d40c90202d3cd72e19d970c482 Mon Sep 17 00:00:00 2001 From: Alex Nordlund Date: Thu, 25 Aug 2022 20:57:43 +0200 Subject: [PATCH 2/2] Replace to-be obsolete patchesStrategicMerge with patches --- .../overlays/namespace_kube-system/kustomization.yaml | 4 ++-- .../overlays/fractional_resources/kustomization.yaml | 8 ++++---- .../overlays/namespace_kube-system/kustomization.yaml | 4 ++-- .../overlays/nfd_labeled_nodes/kustomization.yaml | 4 ++-- deployments/qat_plugin/overlays/debug/kustomization.yaml | 4 ++-- deployments/qat_plugin/overlays/e2e/kustomization.yaml | 4 ++-- .../overlays/epc-hook-initcontainer/kustomization.yaml | 4 ++-- .../sgx_plugin/overlays/epc-nfd/kustomization.yaml | 4 ++-- .../sgx_plugin/overlays/epc-register/kustomization.yaml | 4 ++-- .../overlays/namespace_kube-system/kustomization.yaml | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/deployments/dsa_plugin/overlays/namespace_kube-system/kustomization.yaml b/deployments/dsa_plugin/overlays/namespace_kube-system/kustomization.yaml index 4b9492a27..574b82a50 100644 --- 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 -patchesStrategicMerge: - - add-namespace-kube-system.yaml +patches: + - 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 index b37b95e4f..08e364f5a 100644 --- 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 -patchesStrategicMerge: - - add-serviceaccount.yaml - - add-podresource-mount.yaml - - add-args.yaml +patches: + - 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 index 4b9492a27..574b82a50 100644 --- 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 -patchesStrategicMerge: - - add-namespace-kube-system.yaml +patches: + - 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 index fc12a6af1..a29f7bc2a 100644 --- 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 -patchesStrategicMerge: - - add-nodeselector-intel-gpu.yaml +patches: + - path: add-nodeselector-intel-gpu.yaml diff --git a/deployments/qat_plugin/overlays/debug/kustomization.yaml b/deployments/qat_plugin/overlays/debug/kustomization.yaml index d18a40a4d..118fc9018 100644 --- a/deployments/qat_plugin/overlays/debug/kustomization.yaml +++ b/deployments/qat_plugin/overlays/debug/kustomization.yaml @@ -1,5 +1,5 @@ nameSuffix: -debug bases: - ../../base -patchesStrategicMerge: - - add-args.yaml +patches: + - path: add-args.yaml diff --git a/deployments/qat_plugin/overlays/e2e/kustomization.yaml b/deployments/qat_plugin/overlays/e2e/kustomization.yaml index 99271b27b..58ade5759 100644 --- a/deployments/qat_plugin/overlays/e2e/kustomization.yaml +++ b/deployments/qat_plugin/overlays/e2e/kustomization.yaml @@ -5,5 +5,5 @@ commonAnnotations: resources: - ../sriov_numvfs -patchesStrategicMerge: - - add-args.yaml +patches: + - 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 index dfb3b71a0..e000fd063 100644 --- 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 -patchesStrategicMerge: - - add-epc-nfd-initcontainer.yaml +patches: + - 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 index 138f3a268..ed888f6ce 100644 --- 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 -patchesStrategicMerge: - - add-epc-nfd-initcontainer.yaml +patches: + - 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 index dd39f271e..8b76d7326 100644 --- 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 -patchesStrategicMerge: - - add-node-selector.yaml +patches: + - 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 index 4b9492a27..574b82a50 100644 --- 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 -patchesStrategicMerge: - - add-namespace-kube-system.yaml +patches: + - path: add-namespace-kube-system.yaml