github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

remove the opt out choice of kustomize

Browse Source
This commit is contained in:
Jingfang Liu 2018-12-17 14:52:07 -08:00
parent 0ce8427b46
commit ac209ccdc0
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/delete/delete_flags.go
View File

@ -90,7 +90,6 @@ func (f *DeleteFlags) ToOptions(dynamicClient dynamic.Interface, streams generic
options.WaitForDeletion = *f.Wait options.WaitForDeletion = *f.Wait
} }
options.FilenameOptions.EnableKustomization = true
return options return options
} }

1
pkg/kubectl/cmd/util/helpers.go
View File

@ -385,7 +385,6 @@ func AddValidateOptionFlags(cmd *cobra.Command, options *ValidateOptions) {
func AddFilenameOptionFlags(cmd *cobra.Command, options *resource.FilenameOptions, usage string) { func AddFilenameOptionFlags(cmd *cobra.Command, options *resource.FilenameOptions, usage string) {
AddJsonFilenameFlag(cmd.Flags(), &options.Filenames, "Filename, directory, or URL to files "+usage) AddJsonFilenameFlag(cmd.Flags(), &options.Filenames, "Filename, directory, or URL to files "+usage)
cmd.Flags().BoolVarP(&options.Recursive, "recursive", "R", options.Recursive, "Process the directory used in -f, --filename recursively. Useful when you want to manage related manifests organized within the same directory.") cmd.Flags().BoolVarP(&options.Recursive, "recursive", "R", options.Recursive, "Process the directory used in -f, --filename recursively. Useful when you want to manage related manifests organized within the same directory.")
options.EnableKustomization = true
} }
func AddJsonFilenameFlag(flags *pflag.FlagSet, value *[]string, usage string) { func AddJsonFilenameFlag(flags *pflag.FlagSet, value *[]string, usage string) {

12
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource/builder.go
View File

@ -130,9 +130,8 @@ func IsUsageError(err error) bool {
} }
type FilenameOptions struct { type FilenameOptions struct {
Filenames []string Filenames []string
Recursive bool Recursive bool
EnableKustomization bool
} }
type resourceTuple struct { type resourceTuple struct {
@ -198,7 +197,6 @@ func (b *Builder) AddError(err error) *Builder {
// recognized will be ignored (but logged at V(2)). // recognized will be ignored (but logged at V(2)).
func (b *Builder) FilenameParam(enforceNamespace bool, filenameOptions *FilenameOptions) *Builder { func (b *Builder) FilenameParam(enforceNamespace bool, filenameOptions *FilenameOptions) *Builder {
recursive := filenameOptions.Recursive recursive := filenameOptions.Recursive
enableKustomization := filenameOptions.EnableKustomization
paths := filenameOptions.Filenames paths := filenameOptions.Filenames
for _, s := range paths { for _, s := range paths {
switch { switch {
@ -215,7 +213,7 @@ func (b *Builder) FilenameParam(enforceNamespace bool, filenameOptions *Filename
if !recursive { if !recursive {
b.singleItemImplied = true b.singleItemImplied = true
} }
b.Path(recursive, enableKustomization, s) b.Path(recursive, s)
} }
} }
@ -334,7 +332,7 @@ func (b *Builder) Stream(r io.Reader, name string) *Builder {
// FileVisitor is streaming the content to a StreamVisitor. If ContinueOnError() is set // FileVisitor is streaming the content to a StreamVisitor. If ContinueOnError() is set
// prior to this method being called, objects on the path that are unrecognized will be // prior to this method being called, objects on the path that are unrecognized will be
// ignored (but logged at V(2)). // ignored (but logged at V(2)).
func (b *Builder) Path(recursive, enableKustomization bool, paths ...string) *Builder { func (b *Builder) Path(recursive bool, paths ...string) *Builder {
for _, p := range paths { for _, p := range paths {
_, err := os.Stat(p) _, err := os.Stat(p)
if os.IsNotExist(err) { if os.IsNotExist(err) {
@ -346,7 +344,7 @@ func (b *Builder) Path(recursive, enableKustomization bool, paths ...string) *Bu
continue continue
} }
visitors, err := ExpandPathsToFileVisitors(b.mapper, p, recursive, enableKustomization, FileExtensions, b.schema) visitors, err := ExpandPathsToFileVisitors(b.mapper, p, recursive, FileExtensions, b.schema)
if err != nil { if err != nil {
b.errs = append(b.errs, fmt.Errorf("error reading %q: %v", p, err)) b.errs = append(b.errs, fmt.Errorf("error reading %q: %v", p, err))
} }

2
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource/builder_test.go
View File

@ -478,7 +478,7 @@ func TestDirectoryBuilder(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
b := newDefaultBuilder(). b := newDefaultBuilder().
FilenameParam(false, &FilenameOptions{Recursive: false, EnableKustomization: true, Filenames: tt.directories}). FilenameParam(false, &FilenameOptions{Recursive: false, Filenames: tt.directories}).
NamespaceParam("test").DefaultNamespace() NamespaceParam("test").DefaultNamespace()
test := &testVisitor{} test := &testVisitor{}

6
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource/visitor.go
View File

@ -451,13 +451,13 @@ func FileVisitorForSTDIN(mapper *mapper, schema ContentValidator) Visitor {
// ExpandPathsToFileVisitors will return a slice of FileVisitors that will handle files from the provided path. // ExpandPathsToFileVisitors will return a slice of FileVisitors that will handle files from the provided path.
// After FileVisitors open the files, they will pass an io.Reader to a StreamVisitor to do the reading. (stdin // After FileVisitors open the files, they will pass an io.Reader to a StreamVisitor to do the reading. (stdin
// is also taken care of). Paths argument also accepts a single file, and will return a single visitor // is also taken care of). Paths argument also accepts a single file, and will return a single visitor
func ExpandPathsToFileVisitors(mapper *mapper, paths string, recursive bool, enableKustomize bool, extensions []string, schema ContentValidator) ([]Visitor, error) { func ExpandPathsToFileVisitors(mapper *mapper, paths string, recursive bool, extensions []string, schema ContentValidator) ([]Visitor, error) {
var visitors []Visitor var visitors []Visitor
err := filepath.Walk(paths, func(path string, fi os.FileInfo, err error) error { err := filepath.Walk(paths, func(path string, fi os.FileInfo, err error) error {
if err != nil { if err != nil {
return err return err
} }
if enableKustomize && isKustomizationDir(path) { if isKustomizationDir(path) {
visitors = append(visitors, NewKustomizationVisitor(mapper, path, schema)) visitors = append(visitors, NewKustomizationVisitor(mapper, path, schema))
return filepath.SkipDir return filepath.SkipDir
} }
@ -471,7 +471,7 @@ func ExpandPathsToFileVisitors(mapper *mapper, paths string, recursive bool, ena
if path != paths && ignoreFile(path, extensions) { if path != paths && ignoreFile(path, extensions) {
return nil return nil
} }
if enableKustomize && filepath.Base(path) == constants.KustomizationFileName { if filepath.Base(path) == constants.KustomizationFileName {
visitors = append(visitors, NewKustomizationVisitor(mapper, filepath.Dir(path), schema)) visitors = append(visitors, NewKustomizationVisitor(mapper, filepath.Dir(path), schema))
return nil return nil
} }