kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

add edit-fix for patchesStrategicMerge to patches

Browse Source
This commit is contained in:
yugo kobayashi
2022-07-29 17:34:38 +00:00
parent 1b0fe2a078
commit 64f42ea45f
3 changed files with 110 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/types/kustomization.go
View File

@@ -222,6 +222,13 @@ func (k *Kustomization) FixKustomizationPreMarshalling() error {
k.Patches = append(k.Patches, k.PatchesJson6902...)
k.PatchesJson6902 = nil
if k.PatchesStrategicMerge != nil {
for _, patchStrategicMerge := range k.PatchesStrategicMerge {
k.Patches = append(k.Patches, Patch{Patch: string(patchStrategicMerge)})
}
k.PatchesStrategicMerge = nil
}
// this fix is not in FixKustomizationPostUnmarshalling because
// it will break some commands like `create` and `add`. those
// commands depend on 'commonLabels' field