Clean up option construction.

api/krusty/options.go

@@ -37,7 +37,8 @@ type Options struct {
 // MakeDefaultOptions returns a default instance of Options.
 func MakeDefaultOptions() *Options {
 	return &Options{
-		DoLegacyResourceSort: true,
+		DoLegacyResourceSort: false,
+		AddManagedbyLabel:    false,
 		LoadRestrictions:     types.LoadRestrictionsRootOnly,
 		DoPrune:              false,
 		PluginConfig:         konfig.DisabledPluginConfig(),

api/testutils/kusttest/harness.go

@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-// Harness manages a kustomize environment for tests.
+// Harness manages a test environment.
 type Harness struct {
 	t    *testing.T
 	fSys filesys.FileSystem
@@ -72,15 +72,12 @@ func (th Harness) MakeDefaultOptions() krusty.Options {
 
 // This has no impact on Builtin plugins, as they are always enabled.
 func (th Harness) MakeOptionsPluginsDisabled() krusty.Options {
-	return krusty.Options{
+	return *krusty.MakeDefaultOptions()
-		LoadRestrictions: types.LoadRestrictionsRootOnly,
-		PluginConfig:     konfig.DisabledPluginConfig(),
-	}
 }
 
 // Enables use of non-builtin plugins.
 func (th Harness) MakeOptionsPluginsEnabled() krusty.Options {
-	c, err := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
+	pc, err := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
 	if err != nil {
 		if strings.Contains(err.Error(), "unable to find plugin root") {
 			th.t.Log(
@@ -89,10 +86,9 @@ func (th Harness) MakeOptionsPluginsEnabled() krusty.Options {
 		}
 		th.t.Fatal(err)
 	}
-	return krusty.Options{
+	o := *krusty.MakeDefaultOptions()
-		LoadRestrictions: types.LoadRestrictionsRootOnly,
+	o.PluginConfig = pc
-		PluginConfig:     c,
+	return o
-	}
 }
 
 // Run, failing on error.

kustomize/internal/commands/build/build.go

@@ -120,25 +120,18 @@ func (o *Options) Validate(args []string) (err error) {
 }
 
 func (o *Options) makeOptions() *krusty.Options {
-	opts := &krusty.Options{
+	opts := krusty.MakeDefaultOptions()
-		DoLegacyResourceSort: o.outOrder == legacy,
+	opts.DoLegacyResourceSort = o.outOrder == legacy
-		LoadRestrictions:     getFlagLoadRestrictorValue(),
+	opts.LoadRestrictions = getFlagLoadRestrictorValue()
-	}
 	if isFlagEnablePluginsSet() {
 		c, err := konfig.EnabledPluginConfig(types.BploUseStaticallyLinked)
 		if err != nil {
 			log.Fatal(err)
 		}
-
 		c.FnpLoadingOptions = o.fnOptions
-
 		opts.PluginConfig = c
-	} else {
-		opts.PluginConfig = konfig.DisabledPluginConfig()
-	}
-	if isManagedbyLabelEnabled() {
-		opts.AddManagedbyLabel = true
 	}
+	opts.AddManagedbyLabel = isManagedbyLabelEnabled()
 	return opts
 }