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

Secret/configmap factory cleanup.

Browse Source
This commit is contained in:
jregan
2019-03-12 13:16:44 -07:00
committed by Jeffrey Regan
parent c4da063934
commit c06b95077d
14 changed files with 158 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,8 +67,8 @@ func newCmdAddConfigMap(fSys fs.FileSystem, kf ifc.KunstructuredFactory) *cobra.
}
// Add the flagsAndArgs map to the kustomization file.
kf.Set(loader.NewFileLoaderAtCwd(fSys))
err = addConfigMap(kustomization, flags, kf)
err = addConfigMap(
loader.NewFileLoaderAtCwd(fSys), kustomization, flags, kf)
if err != nil {
return err
}
@@ -103,6 +103,7 @@ func newCmdAddConfigMap(fSys fs.FileSystem, kf ifc.KunstructuredFactory) *cobra.
// Note: error may leave kustomization file in an undefined state.
// Suggest passing a copy of kustomization file.
func addConfigMap(
ldr ifc.Loader,
k *types.Kustomization,
flags flagsAndArgs, kf ifc.KunstructuredFactory) error {
cmArgs := makeConfigMapArgs(k, flags.Name)
@@ -111,7 +112,7 @@ func addConfigMap(
return err
}
// Validate by trying to create corev1.configmap.
_, err = kf.MakeConfigMap(cmArgs, k.GeneratorOptions)
_, err = kf.MakeConfigMap(ldr, k.GeneratorOptions, cmArgs)
if err != nil {
return err
}

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

@@ -67,8 +67,8 @@ func newCmdAddSecret(fSys fs.FileSystem, kf ifc.KunstructuredFactory) *cobra.Com
}
// Add the flagsAndArgs map to the kustomization file.
kf.Set(loader.NewFileLoaderAtCwd(fSys))
err = addSecret(kustomization, flags, kf)
err = addSecret(
loader.NewFileLoaderAtCwd(fSys), kustomization, flags, kf)
if err != nil {
return err
}
@@ -108,6 +108,7 @@ func newCmdAddSecret(fSys fs.FileSystem, kf ifc.KunstructuredFactory) *cobra.Com
// Note: error may leave kustomization file in an undefined state.
// Suggest passing a copy of kustomization file.
func addSecret(
ldr ifc.Loader,
k *types.Kustomization,
flags flagsAndArgs, kf ifc.KunstructuredFactory) error {
secretArgs := makeSecretArgs(k, flags.Name, flags.Type)
@@ -116,7 +117,7 @@ func addSecret(
return err
}
// Validate by trying to create corev1.secret.
_, err = kf.MakeSecret(secretArgs, k.GeneratorOptions)
_, err = kf.MakeSecret(ldr, k.GeneratorOptions, secretArgs)
if err != nil {
return err
}