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

Pull factories out of the bowels.

Browse Source
This commit is contained in:
Jeffrey Regan
2018-07-23 11:46:17 -07:00
parent 5715f4bab4
commit 969f4f28fa
9 changed files with 95 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/commands/configmap.go
View File

@@ -59,9 +59,10 @@ func newCmdAddConfigMap(fSys fs.FileSystem) *cobra.Command {
if err != nil {
return err
}
// Add the flagsAndArgs map to the kustomization file.
err = addConfigMap(kustomization, flagsAndArgs, fSys)
err = addConfigMap(
kustomization, flagsAndArgs,
configmapandsecret.NewConfigMapFactory(fSys, nil))
if err != nil {
return err
}
@@ -93,24 +94,22 @@ func newCmdAddConfigMap(fSys fs.FileSystem) *cobra.Command {
}
// addConfigMap adds a configmap to a kustomization file.
// Note: error may leave kustomization file in an undefined state. Suggest passing a copy
// of kustomization file.
func addConfigMap(k *types.Kustomization, flagsAndArgs cMapFlagsAndArgs, fSys fs.FileSystem) error {
// Note: error may leave kustomization file in an undefined state.
// Suggest passing a copy of kustomization file.
func addConfigMap(
k *types.Kustomization,
flagsAndArgs cMapFlagsAndArgs,
factory *configmapandsecret.ConfigMapFactory) error {
cmArgs := makeConfigMapArgs(k, flagsAndArgs.Name)
err := mergeFlagsIntoCmArgs(&cmArgs.DataSources, flagsAndArgs)
if err != nil {
return err
}
factory := configmapandsecret.NewConfigMapFactory(cmArgs, nil, fSys)
// Validate by trying to create corev1.configmap.
_, _, err = factory.MakeUnstructAndGenerateName()
_, _, err = factory.MakeUnstructAndGenerateName(cmArgs)
if err != nil {
return err
}
return nil
}