remove flag logic

This commit is contained in:
john
2019-11-29 08:58:14 +00:00
parent bf339173c8
commit 61133f3e2e
7 changed files with 6 additions and 49 deletions

View File

@@ -34,8 +34,7 @@ func NewFakeLoaderWithRestrictor(
// Create fake filesystem and inject it into initial Loader.
fSys := filesys.MakeFsInMemory()
fSys.Mkdir(initialDir)
dc := false
ldr, err := loader.NewLoader(lr, initialDir, fSys, dc)
ldr, err := loader.NewLoader(lr, initialDir, fSys)
if err != nil {
log.Fatalf("Unable to make loader: %v", err)
}

View File

@@ -57,9 +57,8 @@ metadata:
t.Fatalf("err %v", err)
}
dc := false
ldr, err := fLdr.NewLoader(
fLdr.RestrictionRootOnly, dir, fSys, dc)
fLdr.RestrictionRootOnly, dir, fSys)
if err != nil {
t.Fatalf("Err: %v", err)
}

View File

@@ -54,8 +54,7 @@ func (b *Kustomizer) Run(path string) (resmap.ResMap, error) {
if b.options.LoadRestrictions == types.LoadRestrictionsRootOnly {
lr = fLdr.RestrictionRootOnly
}
ldr, err := fLdr.NewLoader(lr, path, b.fSys, b.options.DoDeepGitClone)
ldr, err := fLdr.NewLoader(lr, path, b.fSys)
if err != nil {
return nil, err
}

View File

@@ -18,10 +18,6 @@ type Options struct {
// order as specified by the kustomization file(s).
DoLegacyResourceSort bool
// When true, use full-depth git clone, in order to allow
// reference to a specific commit
DoDeepGitClone bool
// Restrictions on what can be loaded from the file system.
// See type definition.
LoadRestrictions types.LoadRestrictions
@@ -37,7 +33,6 @@ type Options struct {
func MakeDefaultOptions() *Options {
return &Options{
DoLegacyResourceSort: true,
DoDeepGitClone: false,
LoadRestrictions: types.LoadRestrictionsRootOnly,
DoPrune: false,
PluginConfig: konfig.DisabledPluginConfig(),

View File

@@ -18,21 +18,17 @@ import (
// the remote bases will all be root-only restricted.
func NewLoader(
lr LoadRestrictorFunc,
target string, fSys filesys.FileSystem, deepClone bool) (ifc.Loader, error) {
cloner := git.ClonerUsingGitExec
if deepClone {
cloner = git.DeepClonerUsingGitExec
}
target string, fSys filesys.FileSystem) (ifc.Loader, error) {
repoSpec, err := git.NewRepoSpecFromUrl(target)
if err == nil {
// The target qualifies as a remote git target.
return newLoaderAtGitClone(
repoSpec, fSys, nil, cloner)
repoSpec, fSys, nil, git.ClonerUsingGitExec)
}
root, err := demandDirectoryRoot(fSys, target)
if err != nil {
return nil, err
}
return newLoaderAtConfirmedDir(
lr, root, fSys, nil, cloner), nil
lr, root, fSys, nil, git.ClonerUsingGitExec), nil
}

View File

@@ -76,7 +76,6 @@ func NewCmdBuild(out io.Writer) *cobra.Command {
addFlagLoadRestrictor(cmd.Flags())
addFlagEnablePlugins(cmd.Flags())
addFlagReorderOutput(cmd.Flags())
addFlagEnableDeepClone(cmd.Flags())
cmd.AddCommand(NewCmdBuildPrune(out))
return cmd
}
@@ -106,7 +105,6 @@ func (o *Options) makeOptions() *krusty.Options {
DoLegacyResourceSort: o.outOrder == legacy,
LoadRestrictions: getFlagLoadRestrictorValue(),
DoPrune: false,
DoDeepGitClone: isFlagEnableDeepCloneSet(),
}
if isFlagEnablePluginsSet() {
c, err := konfig.EnabledPluginConfig()

View File

@@ -1,29 +0,0 @@
// Copyright 2019 The Kubernetes Authors.
// SPDX-License-Identifier: Apache-2.0
package build
import (
"github.com/spf13/pflag"
)
const (
flagEnableDeepCloneName = "enable_deep_clone"
flagEnableDeepCloneHelp = `enable deep git cloning.
See https://github.com/kubernetes-sigs/kustomize/issues/1452
`
)
var (
flagEnableDeepCloneValue = false
)
func addFlagEnableDeepClone(set *pflag.FlagSet) {
set.BoolVar(
&flagEnableDeepCloneValue, flagEnableDeepCloneName,
false, flagEnableDeepCloneHelp)
}
func isFlagEnableDeepCloneSet() bool {
return flagEnableDeepCloneValue
}