Add --reorder flag.

pkg/commands/build/build.go

@@ -1,4 +1,4 @@
-/// Copyright 2019 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package build
@@ -28,6 +28,7 @@ type Options struct {
 	kustomizationPath string
 	outputPath        string
 	loadRestrictor    loader.LoadRestrictorFunc
+	outOrder          reorderOutput
 }
 
 // NewOptions creates a Options object
@@ -40,18 +41,20 @@ func NewOptions(p, o string) *Options {
 }
 
 var examples = `
-Use the file somedir/kustomization.yaml to generate a set of api resources:
-    build somedir
+To generate the resources specified in 'someDir/kustomization.yaml', run
 
-Use a url pointing to a remote directory/kustomization.yaml to generate a set of api resources:
-    build url
-The url should follow hashicorp/go-getter URL format described in
+  kustomize build someDir
+
+The default argument to 'build' is '.' (the current working directory).
+
+The argument can be a URL resolving to a directory
+with a kustomization.yaml file, e.g.
+
+  kustomize build \
+    github.com/kubernetes-sigs/kustomize//examples/multibases/dev/?ref=v1.0.6
+
+The URL should be formulated as described at
 https://github.com/hashicorp/go-getter#url-format
-
-url examples:
-  sigs.k8s.io/kustomize//examples/multibases?ref=v1.0.6
-  github.com/Liujingfang1/mysql
-  github.com/Liujingfang1/kustomize//examples/helloWorld?ref=repoUrl2
 `
 
 // NewCmdBuild creates a new build command.
@@ -65,8 +68,8 @@ func NewCmdBuild(
 	pl := plugins.NewLoader(pluginConfig, rf)
 
 	cmd := &cobra.Command{
-		Use:          "build [path]",
-		Short:        "Print current configuration per contents of " + pgmconfig.KustomizationFileNames[0],
+		Use:          "build {path}",
+		Short:        "Print configuration per contents of " + pgmconfig.KustomizationFileNames[0],
 		Example:      examples,
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -82,10 +85,10 @@ func NewCmdBuild(
 		&o.outputPath,
 		"output", "o", "",
 		"If specified, write the build output to this path.")
-	loader.AddLoadRestrictionsFlag(cmd.Flags())
-	plugins.AddEnablePluginsFlag(
+	loader.AddFlagLoadRestrictor(cmd.Flags())
+	plugins.AddFlagEnablePlugins(
 		cmd.Flags(), &pluginConfig.Enabled)
-
+	addFlagReorderOutput(cmd.Flags())
 	cmd.AddCommand(NewCmdBuildPrune(out, v, fSys, rf, ptf, pl))
 	return cmd
 }
@@ -101,7 +104,11 @@ func (o *Options) Validate(args []string) (err error) {
 	} else {
 		o.kustomizationPath = args[0]
 	}
-	o.loadRestrictor, err = loader.ValidateLoadRestrictorFlag()
+	o.loadRestrictor, err = loader.ValidateFlagLoadRestrictor()
+	if err != nil {
+		return err
+	}
+	o.outOrder, err = validateFlagReorderOutput()
 	return
 }
 
@@ -153,11 +160,13 @@ func (o *Options) emitResources(
 	if o.outputPath != "" && fSys.IsDir(o.outputPath) {
 		return writeIndividualFiles(fSys, o.outputPath, m)
 	}
-	// Done this way just to prove that overall sorting
-	// can be performed by a plugin.  This particular
-	// plugin doesn't require configuration; just make
-	// it and call transform.
-	builtin.NewPreferredOrderTransformerPlugin().Transform(m)
+	if o.outOrder == legacy {
+		// Done this way just to show how overall sorting
+		// can be performed by a plugin.  This particular
+		// plugin doesn't require configuration; just make
+		// it and call transform.
+		builtin.NewLegacyOrderTransformerPlugin().Transform(m)
+	}
 	res, err := m.AsYaml()
 	if err != nil {
 		return err

pkg/commands/build/reorderoutput.go

@@ -0,0 +1,50 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package build
+
+import (
+	"fmt"
+
+	"github.com/spf13/pflag"
+)
+
+//go:generate stringer -type=reorderOutput
+type reorderOutput int
+
+const (
+	unspecified reorderOutput = iota
+	none
+	legacy
+)
+
+const (
+	flagReorderOutputName = "reorder"
+)
+
+var (
+	flagReorderOutputValue = legacy.String()
+	flagReorderOutputHelp  = "Reorder the resources just before output. " +
+		"Use '" + legacy.String() + "' to apply a legacy reordering (Namespaces first, Webhooks last, etc). " +
+		"Use '" + none.String() + "' to suppress a final reordering."
+)
+
+func addFlagReorderOutput(set *pflag.FlagSet) {
+	set.StringVar(
+		&flagReorderOutputValue, flagReorderOutputName,
+		legacy.String(), flagReorderOutputHelp)
+}
+
+func validateFlagReorderOutput() (reorderOutput, error) {
+	switch flagReorderOutputValue {
+	case none.String():
+		return none, nil
+	case legacy.String():
+		return legacy, nil
+	default:
+		return unspecified, fmt.Errorf(
+			"illegal flag value --%s %s; legal values: %v",
+			flagReorderOutputName, flagReorderOutputValue,
+			[]string{legacy.String(), none.String()})
+	}
+}

pkg/commands/build/reorderoutput_string.go

@@ -0,0 +1,25 @@
+// Code generated by "stringer -type=reorderOutput"; DO NOT EDIT.
+
+package build
+
+import "strconv"
+
+func _() {
+	// An "invalid array index" compiler error signifies that the constant values have changed.
+	// Re-run the stringer command to generate them again.
+	var x [1]struct{}
+	_ = x[unspecified-0]
+	_ = x[none-1]
+	_ = x[legacy-2]
+}
+
+const _reorderOutput_name = "unspecifiednonelegacy"
+
+var _reorderOutput_index = [...]uint8{0, 11, 15, 21}
+
+func (i reorderOutput) String() string {
+	if i < 0 || i >= reorderOutput(len(_reorderOutput_index)-1) {
+		return "reorderOutput(" + strconv.FormatInt(int64(i), 10) + ")"
+	}
+	return _reorderOutput_name[_reorderOutput_index[i]:_reorderOutput_index[i+1]]
+}