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

Fix some nits.

Browse Source
This commit is contained in:
Jeffrey Regan
2019-05-07 17:56:48 -07:00
parent 607eb13a52
commit 7295a9b32e
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/resmap/legacygeneratorargs.go
View File

@@ -12,26 +12,26 @@ func GeneratorArgsFromKunstruct(k ifc.Kunstructured) (
result.Name = k.GetName()
// TODO: validate behavior values.
result.Behavior, err = k.GetFieldValue("behavior")
if !isAcceptableError(err) {
if !IsAcceptableError(err) {
return
}
result.EnvSources, err = k.GetStringSlice("envFiles")
if !isAcceptableError(err) {
if !IsAcceptableError(err) {
return
}
result.FileSources, err = k.GetStringSlice("valueFiles")
if !isAcceptableError(err) {
if !IsAcceptableError(err) {
return
}
result.LiteralSources, err = k.GetStringSlice("literals")
if !isAcceptableError(err) {
if !IsAcceptableError(err) {
return
}
err = nil
return
}
func isAcceptableError(err error) bool {
func IsAcceptableError(err error) bool {
return err == nil ||
strings.HasPrefix(err.Error(), "no field named")
}

8
plugin/builtin/SecretGenerator.go
View File

@@ -25,9 +25,11 @@ func (p *plugin) Config(
if err != nil {
return
}
// Ignore missing type - it defaults.
p.args.Type, _ = k.GetFieldValue("type")
return
p.args.Type, err = k.GetFieldValue("type")
if !resmap.IsAcceptableError(err) {
return
}
return nil
}
func (p *plugin) Generate() (resmap.ResMap, error) {