Make a secret factory.

This commit is contained in:
Jeffrey Regan
2018-07-20 09:01:37 -07:00
parent 0197c019cc
commit 276693cf0e
9 changed files with 32 additions and 23 deletions

View File

@@ -69,8 +69,8 @@ func (o *buildOptions) Validate(args []string) error {
}
// RunBuild runs build command.
func (o *buildOptions) RunBuild(out io.Writer, fs fs.FileSystem) error {
l := loader.Init([]loader.SchemeLoader{loader.NewFileLoader(fs)})
func (o *buildOptions) RunBuild(out io.Writer, fSys fs.FileSystem) error {
l := loader.Init([]loader.SchemeLoader{loader.NewFileLoader(fSys)})
absPath, err := filepath.Abs(o.kustomizationPath)
if err != nil {
@@ -82,7 +82,7 @@ func (o *buildOptions) RunBuild(out io.Writer, fs fs.FileSystem) error {
return err
}
application, err := app.NewApplication(rootLoader)
application, err := app.NewApplication(rootLoader, fSys)
if err != nil {
return err
}

View File

@@ -103,7 +103,7 @@ func addConfigMap(k *types.Kustomization, flagsAndArgs cMapFlagsAndArgs, fSys fs
return err
}
factory := configmapandsecret.NewConfigMapFactory(cmArgs, fSys, nil)
factory := configmapandsecret.NewConfigMapFactory(cmArgs, nil, fSys)
// Validate by trying to create corev1.configmap.
_, _, err = factory.MakeUnstructAndGenerateName()

View File

@@ -66,9 +66,9 @@ func (o *diffOptions) Validate(args []string) error {
}
// RunDiff gets the differences between Application.MakeCustomizedResMap() and Application.MakeUncustomizedResMap().
func (o *diffOptions) RunDiff(out, errOut io.Writer, fs fs.FileSystem) error {
func (o *diffOptions) RunDiff(out, errOut io.Writer, fSys fs.FileSystem) error {
l := loader.Init([]loader.SchemeLoader{loader.NewFileLoader(fs)})
l := loader.Init([]loader.SchemeLoader{loader.NewFileLoader(fSys)})
absPath, err := filepath.Abs(o.kustomizationPath)
if err != nil {
@@ -80,7 +80,7 @@ func (o *diffOptions) RunDiff(out, errOut io.Writer, fs fs.FileSystem) error {
return err
}
application, err := app.NewApplication(rootLoader)
application, err := app.NewApplication(rootLoader, fSys)
if err != nil {
return err
}