kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Some cleanup refactoring in app package.

Browse Source
This commit is contained in:
jregan
2018-06-09 18:50:53 -07:00
committed by Jeffrey Regan
parent 6b5569d5ed
commit 211cda054e
8 changed files with 145 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/transformers/patch.go
View File

@@ -85,7 +85,7 @@ func (pt *patchTransformer) Transform(baseResourceMap resmap.ResMap) error {
case err != nil:
return err
default:
// Use Strategic Merge Patch to handle types w/ schema
// Use Strategic-Merge-Patch to handle types w/ schema
// TODO: Change this to use the new Merge package.
// Store the name of the base object, because this name may have been munged.
// Apply this name to the StrategicMergePatched object.

3
pkg/transformers/patchconflictdetector.go
View File

@@ -19,8 +19,7 @@ package transformers
import (
"encoding/json"
"github.com/evanphx/json-patch"
jsonpatch "github.com/evanphx/json-patch"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/mergepatch"