diff --git a/cmd/flux/build_kustomization.go b/cmd/flux/build_kustomization.go index 5d29c001..6aea4944 100644 --- a/cmd/flux/build_kustomization.go +++ b/cmd/flux/build_kustomization.go @@ -111,30 +111,24 @@ func buildKsCmdRun(cmd *cobra.Command, args []string) (err error) { } } + var options []build.BuilderOptionFunc var builder *build.Builder + + options = append(options, + build.WithClientConfig(kubeconfigArgs, kubeclientOptions), + build.WithTimeout(rootArgs.timeout), + build.WithKustomizationFile(buildKsArgs.kustomizationFile), + build.WithIgnore(buildKsArgs.ignorePaths), + build.WithStrictSubstitute(buildKsArgs.strictSubst), + build.WithRecursive(buildKsArgs.recursive), + build.WithLocalSources(buildKsArgs.localSources), + ) + if buildKsArgs.dryRun { - builder, err = build.NewBuilder(name, buildKsArgs.path, - build.WithTimeout(rootArgs.timeout), - build.WithKustomizationFile(buildKsArgs.kustomizationFile), - build.WithDryRun(buildKsArgs.dryRun), - build.WithNamespace(*kubeconfigArgs.Namespace), - build.WithIgnore(buildKsArgs.ignorePaths), - build.WithStrictSubstitute(buildKsArgs.strictSubst), - build.WithRecursive(buildKsArgs.recursive), - build.WithLocalSources(buildKsArgs.localSources), - ) - } else { - builder, err = build.NewBuilder(name, buildKsArgs.path, - build.WithClientConfig(kubeconfigArgs, kubeclientOptions), - build.WithTimeout(rootArgs.timeout), - build.WithKustomizationFile(buildKsArgs.kustomizationFile), - build.WithIgnore(buildKsArgs.ignorePaths), - build.WithStrictSubstitute(buildKsArgs.strictSubst), - build.WithRecursive(buildKsArgs.recursive), - build.WithLocalSources(buildKsArgs.localSources), - ) + options = append(options, build.WithDryRun(buildKsArgs.dryRun)) } + builder, err = build.NewBuilder(name, buildKsArgs.path, options...) if err != nil { return err } diff --git a/cmd/flux/diff_kustomization.go b/cmd/flux/diff_kustomization.go index 0480e293..efec44cf 100644 --- a/cmd/flux/diff_kustomization.go +++ b/cmd/flux/diff_kustomization.go @@ -99,34 +99,27 @@ func diffKsCmdRun(cmd *cobra.Command, args []string) error { } var ( + options []build.BuilderOptionFunc builder *build.Builder err error ) + + options = append(options, + build.WithClientConfig(kubeconfigArgs, kubeclientOptions), + build.WithTimeout(rootArgs.timeout), + build.WithKustomizationFile(diffKsArgs.kustomizationFile), + build.WithIgnore(diffKsArgs.ignorePaths), + build.WithStrictSubstitute(diffKsArgs.strictSubst), + build.WithRecursive(diffKsArgs.recursive), + build.WithLocalSources(diffKsArgs.localSources), + build.WithSingleKustomization(), + ) + if diffKsArgs.progressBar { - builder, err = build.NewBuilder(name, diffKsArgs.path, - build.WithClientConfig(kubeconfigArgs, kubeclientOptions), - build.WithTimeout(rootArgs.timeout), - build.WithKustomizationFile(diffKsArgs.kustomizationFile), - build.WithProgressBar(), - build.WithIgnore(diffKsArgs.ignorePaths), - build.WithStrictSubstitute(diffKsArgs.strictSubst), - build.WithRecursive(diffKsArgs.recursive), - build.WithLocalSources(diffKsArgs.localSources), - build.WithSingleKustomization(), - ) - } else { - builder, err = build.NewBuilder(name, diffKsArgs.path, - build.WithClientConfig(kubeconfigArgs, kubeclientOptions), - build.WithTimeout(rootArgs.timeout), - build.WithKustomizationFile(diffKsArgs.kustomizationFile), - build.WithIgnore(diffKsArgs.ignorePaths), - build.WithStrictSubstitute(diffKsArgs.strictSubst), - build.WithRecursive(diffKsArgs.recursive), - build.WithLocalSources(diffKsArgs.localSources), - build.WithSingleKustomization(), - ) + options = append(options, build.WithProgressBar()) } + builder, err = build.NewBuilder(name, diffKsArgs.path, options...) if err != nil { return &RequestError{StatusCode: 2, Err: err} }