kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #249 from mengqiy/fix_nameprefix_overlay 

fix a bug of nameprefix lost after applying patch
This commit is contained in:
k8s-ci-robot 2018-02-05 09:28:11 -08:00 committed by GitHub
parent 1d83bdccea e5ff878c1e
commit 759c3f9e7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kinflate/commands/testdata/simple/out/expected.yaml vendored
View File

@ -77,7 +77,7 @@ metadata:
foo: bar foo: bar
org: kubernetes org: kubernetes
repo: test-infra repo: test-infra
name: test-infra-mungebot name: test-infra-baseprefix-mungebot
spec: spec:
replicas: 2 replicas: 2
selector: selector:

4
pkg/kinflate/util.go
View File

@ -254,6 +254,9 @@ func manifestToMap(m *manifest.Manifest,
return nil, err return nil, err
} }
} }
// Store the name of the base object, because this name may have been munged.
// Apply this name to the StrategicMergePatched object.
baseName := base.GetName()
merged, err := strategicpatch.StrategicMergeMapPatch( merged, err := strategicpatch.StrategicMergeMapPatch(
base.UnstructuredContent(), base.UnstructuredContent(),
overlay.UnstructuredContent(), overlay.UnstructuredContent(),
@ -261,6 +264,7 @@ func manifestToMap(m *manifest.Manifest,
if err != nil { if err != nil {
return nil, err return nil, err
} }
base.SetName(baseName)
baseResourceMap[gvkn].Object = merged baseResourceMap[gvkn].Object = merged
delete(overlayResouceMap, gvkn) delete(overlayResouceMap, gvkn)
} }