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

Setters: clear set-by if unspecified when setting a value

Browse Source
This commit is contained in:
Phillip Wittrock
2020-02-26 13:53:47 -08:00
parent 5707962df5
commit 573d7b7234
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kyaml/setters2/set.go
View File

@@ -150,11 +150,9 @@ func (s SetOpenAPI) Filter(object *yaml.RNode) (*yaml.RNode, error) {
return nil, err return nil, err
} }
if s.SetBy != "" {
if err := def.PipeE(&yaml.FieldSetter{Name: "setBy", StringValue: s.SetBy}); err != nil { if err := def.PipeE(&yaml.FieldSetter{Name: "setBy", StringValue: s.SetBy}); err != nil {
return nil, err return nil, err
} }
}
if s.Description != "" { if s.Description != "" {
d, err := object.Pipe(yaml.LookupCreate( d, err := object.Pipe(yaml.LookupCreate(

48
kyaml/setters2/set_test.go
View File

@@ -581,6 +581,54 @@ openAPI:
setter: setter:
name: no-match-2 name: no-match-2
value: "2" value: "2"
`,
},
{
name: "set-replicas-set-by-empty",
setter: "replicas",
value: "3",
input: `
openAPI:
definitions:
io.k8s.cli.setters.no-match-1':
x-k8s-cli:
setter:
name: no-match-1
value: "1"
setBy: "package-default"
io.k8s.cli.setters.replicas:
x-k8s-cli:
setter:
name: replicas
value: "4"
setBy: "package-default"
io.k8s.cli.setters.no-match-2':
x-k8s-cli:
setter:
name: no-match-2
value: "2"
setBy: "package-default"
`,
expected: `
openAPI:
definitions:
io.k8s.cli.setters.no-match-1':
x-k8s-cli:
setter:
name: no-match-1
value: "1"
setBy: "package-default"
io.k8s.cli.setters.replicas:
x-k8s-cli:
setter:
name: replicas
value: "3"
io.k8s.cli.setters.no-match-2':
x-k8s-cli:
setter:
name: no-match-2
value: "2"
setBy: "package-default"
`, `,
}, },
{ {