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

Merge pull request #2327 from mortent/StrategicMergeTransformer

Browse Source 
Add strategic merge patch filter based on kyaml libraries
This commit is contained in:
Kubernetes Prow Robot
2020-04-05 16:35:54 -07:00
committed by GitHub
parent 0d2ae19c80 98c08b2b66
commit e12d57e6f2
10 changed files with 385 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kyaml/filtersutil/filtersutil.go
View File

@@ -23,7 +23,7 @@ func ApplyToJSON(filter kio.Filter, objs ...marshalerUnmarshaler) error {
// convert the json objects to rnodes
for i := range objs {
node, err := getRNode(objs[i])
node, err := GetRNode(objs[i])
if err != nil {
return err
}
@@ -55,8 +55,8 @@ type marshalerUnmarshaler interface {
json.Marshaler
}
// getRNode converts k into an RNode
func getRNode(k json.Marshaler) (*yaml.RNode, error) {
// GetRNode converts k into an RNode
func GetRNode(k json.Marshaler) (*yaml.RNode, error) {
j, err := k.MarshalJSON()
if err != nil {
return nil, err