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

Merge pull request #1051 from monopole/fixNits

Browse Source 
Fix a plugin nit.
This commit is contained in:
Jeff Regan
2019-05-07 17:58:15 -07:00
committed by GitHub
parent 607eb13a52 7295a9b32e
commit 01df12cf3c
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() result.Name = k.GetName()
// TODO: validate behavior values. // TODO: validate behavior values.
result.Behavior, err = k.GetFieldValue("behavior") result.Behavior, err = k.GetFieldValue("behavior")
if !isAcceptableError(err) { if !IsAcceptableError(err) {
return return
} }
result.EnvSources, err = k.GetStringSlice("envFiles") result.EnvSources, err = k.GetStringSlice("envFiles")
if !isAcceptableError(err) { if !IsAcceptableError(err) {
return return
} }
result.FileSources, err = k.GetStringSlice("valueFiles") result.FileSources, err = k.GetStringSlice("valueFiles")
if !isAcceptableError(err) { if !IsAcceptableError(err) {
return return
} }
result.LiteralSources, err = k.GetStringSlice("literals") result.LiteralSources, err = k.GetStringSlice("literals")
if !isAcceptableError(err) { if !IsAcceptableError(err) {
return return
} }
err = nil err = nil
return return
} }
func isAcceptableError(err error) bool { func IsAcceptableError(err error) bool {
return err == nil || return err == nil ||
strings.HasPrefix(err.Error(), "no field named") 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 { if err != nil {
return return
} }
// Ignore missing type - it defaults. p.args.Type, err = k.GetFieldValue("type")
p.args.Type, _ = k.GetFieldValue("type") if !resmap.IsAcceptableError(err) {
return return
}
return nil
} }
func (p *plugin) Generate() (resmap.ResMap, error) { func (p *plugin) Generate() (resmap.ResMap, error) {