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

fix mergeFlags

Browse Source
This commit is contained in:
Seth Pollack
2019-03-21 14:58:06 -04:00
parent b60fca05bd
commit 822420e4ab
2 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/commands/edit/add/configmap.go
View File

@@ -127,16 +127,22 @@ func makeConfigMapArgs(m *types.Kustomization, name string) *types.ConfigMapArgs
} }
func mergeFlagsIntoCmArgs(src *[]types.KVSource, flags flagsAndArgs) { func mergeFlagsIntoCmArgs(src *[]types.KVSource, flags flagsAndArgs) {
*src = append(*src, types.KVSource{ if len(flags.LiteralSources) > 0 {
Name: "literals", *src = append(*src, types.KVSource{
Args: flags.LiteralSources, Name: "literals",
}) Args: flags.LiteralSources,
*src = append(*src, types.KVSource{ })
Name: "files", }
Args: flags.FileSources, if len(flags.FileSources) > 0 {
}) *src = append(*src, types.KVSource{
*src = append(*src, types.KVSource{ Name: "files",
Name: "envfiles", Args: flags.FileSources,
Args: []string{flags.EnvFileSource}, })
}) }
if flags.EnvFileSource != "" {
*src = append(*src, types.KVSource{
Name: "envfiles",
Args: []string{flags.EnvFileSource},
})
}
} }

30
pkg/commands/edit/add/secret.go
View File

@@ -132,16 +132,22 @@ func makeSecretArgs(m *types.Kustomization, name, secretType string) *types.Secr
} }
func mergeFlagsIntoSecretArgs(src *[]types.KVSource, flags flagsAndArgs) { func mergeFlagsIntoSecretArgs(src *[]types.KVSource, flags flagsAndArgs) {
*src = append(*src, types.KVSource{ if len(flags.LiteralSources) > 0 {
Name: "literals", *src = append(*src, types.KVSource{
Args: flags.LiteralSources, Name: "literals",
}) Args: flags.LiteralSources,
*src = append(*src, types.KVSource{ })
Name: "files", }
Args: flags.FileSources, if len(flags.FileSources) > 0 {
}) *src = append(*src, types.KVSource{
*src = append(*src, types.KVSource{ Name: "files",
Name: "envfiles", Args: flags.FileSources,
Args: []string{flags.EnvFileSource}, })
}) }
if flags.EnvFileSource != "" {
*src = append(*src, types.KVSource{
Name: "envfiles",
Args: []string{flags.EnvFileSource},
})
}
} }