kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-07-01 02:11:20 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

change patches to patchesStrategicMerge in tests and examples

Browse Source
This commit is contained in:
Jingfang Liu
2018-08-28 09:36:45 -07:00
parent e11ba17248
commit b713d5a1cc
20 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/testdata/testcase-multiple-patches-conflict/in/overlay/kustomization.yaml vendored
View File

@@ -1,7 +1,7 @@
namePrefix: staging-
commonLabels:
env: staging
patches:
patchesStrategicMerge:
- deployment-patch2.yaml
- deployment-patch1.yaml
bases:

2
pkg/commands/testdata/testcase-multiple-patches-noconflict/in/overlay/kustomization.yaml vendored
View File

@@ -1,7 +1,7 @@
namePrefix: staging-
commonLabels:
env: staging
patches:
patchesStrategicMerge:
- patches/deployment-patch1.yaml
- patches/deployment-patch2.yaml
bases:

2
pkg/commands/testdata/testcase-single-overlay/in/overlay/kustomization.yaml vendored
View File

@@ -2,7 +2,7 @@ namePrefix: staging-
commonLabels:
env: staging
team: override-foo
patches:
patchesStrategicMerge:
- deployment.yaml
bases:
- ../package/