Skip to content

Commit 79986a6

Browse files
committed
Replace to-be obsolete patchesStrategicMerge with patches
1 parent 0636e2d commit 79986a6

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
bases:
22
- ../../base
3-
patchesStrategicMerge:
4-
- add-namespace-kube-system.yaml
3+
patches:
4+
- path: add-namespace-kube-system.yaml

deployments/gpu_plugin/overlays/fractional_resources/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resources:
44
- resource-cluster-role-binding.yaml
55
- resource-cluster-role.yaml
66
- resource-reader-sa.yaml
7-
patchesStrategicMerge:
8-
- add-serviceaccount.yaml
9-
- add-podresource-mount.yaml
10-
- add-args.yaml
7+
patches:
8+
- path: add-serviceaccount.yaml
9+
- path: add-podresource-mount.yaml
10+
- path: add-args.yaml
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
bases:
22
- ../../base
3-
patchesStrategicMerge:
4-
- add-namespace-kube-system.yaml
3+
patches:
4+
- path: add-namespace-kube-system.yaml
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
bases:
22
- ../../base
3-
patchesStrategicMerge:
4-
- add-nodeselector-intel-gpu.yaml
3+
patches:
4+
- path: add-nodeselector-intel-gpu.yaml
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
nameSuffix: -debug
22
bases:
33
- ../../base
4-
patchesStrategicMerge:
5-
- add-args.yaml
4+
patches:
5+
- path: add-args.yaml

deployments/qat_plugin/overlays/e2e/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ commonAnnotations:
55
resources:
66
- ../sriov_numvfs
77

8-
patchesStrategicMerge:
9-
- add-args.yaml
8+
patches:
9+
- path: add-args.yaml
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
resources:
22
- ../../base
3-
patchesStrategicMerge:
4-
- add-epc-nfd-initcontainer.yaml
3+
patches:
4+
- path: add-epc-nfd-initcontainer.yaml

deployments/sgx_plugin/overlays/epc-nfd/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ bases:
33
- ../../../nfd/overlays/sgx
44
- ../../../nfd/overlays/node-feature-rules
55
- ../../../sgx_admissionwebhook/overlays/default-with-certmanager
6-
patchesStrategicMerge:
7-
- add-epc-nfd-initcontainer.yaml
6+
patches:
7+
- path: add-epc-nfd-initcontainer.yaml

deployments/sgx_plugin/overlays/epc-register/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ namespace: kube-system
44
resources:
55
- service-account.yaml
66
- init-daemonset.yaml
7-
patchesStrategicMerge:
8-
- add-node-selector.yaml
7+
patches:
8+
- path: add-node-selector.yaml
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
bases:
22
- ../../base
3-
patchesStrategicMerge:
4-
- add-namespace-kube-system.yaml
3+
patches:
4+
- path: add-namespace-kube-system.yaml

0 commit comments

Comments
 (0)