Isolate k8sdeps to top level internal.

kustomize.go

@@ -20,14 +20,16 @@ import (
 	"os"
 
 	"github.com/golang/glog"
-
+	"sigs.k8s.io/kustomize/internal/k8sdeps"
 	"sigs.k8s.io/kustomize/pkg/commands"
 )
 
 func main() {
 	defer glog.Flush()
 
-	if err := commands.NewDefaultCommand().Execute(); err != nil {
+	if err := commands.NewDefaultCommand(
+		k8sdeps.NewKustDecoder(),
+		k8sdeps.NewKustValidator()).Execute(); err != nil {
 		os.Exit(1)
 	}
 	os.Exit(0)

pkg/commands/build_test.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
-	"sigs.k8s.io/kustomize/pkg/internal/k8sdeps"
+	"sigs.k8s.io/kustomize/internal/k8sdeps"
 	"strings"
 	"testing"
 

pkg/commands/commands.go

@@ -20,7 +20,6 @@ package commands
 import (
 	"flag"
 	"os"
-	"sigs.k8s.io/kustomize/pkg/internal/k8sdeps"
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/pkg/fs"
@@ -28,7 +27,8 @@ import (
 )
 
 // NewDefaultCommand returns the default (aka root) command for kustomize command.
-func NewDefaultCommand() *cobra.Command {
+func NewDefaultCommand(
+	decoder ifc.Decoder, validator ifc.Validator) *cobra.Command {
 	fsys := fs.MakeRealFS()
 	stdOut := os.Stdout
 
@@ -44,8 +44,8 @@ See https://sigs.k8s.io/kustomize
 
 	c.AddCommand(
 		// TODO: Make consistent API for newCmd* functions.
-		newCmdBuild(stdOut, fsys, k8sdeps.NewKustDecoder()),
-		newCmdEdit(fsys, k8sdeps.NewKustValidator()),
+		newCmdBuild(stdOut, fsys, decoder),
+		newCmdEdit(fsys, validator),
 		newCmdConfig(fsys),
 		newCmdVersion(stdOut),
 	)

pkg/resmap/resmap_test.go

@@ -19,7 +19,7 @@ package resmap
 import (
 	"fmt"
 	"reflect"
-	"sigs.k8s.io/kustomize/pkg/internal/k8sdeps"
+	"sigs.k8s.io/kustomize/internal/k8sdeps"
 	"testing"
 
 	"sigs.k8s.io/kustomize/pkg/gvk"

pkg/resource/resource_test.go

@@ -18,7 +18,7 @@ package resource
 
 import (
 	"reflect"
-	"sigs.k8s.io/kustomize/pkg/internal/k8sdeps"
+	"sigs.k8s.io/kustomize/internal/k8sdeps"
 	"testing"
 
 	"sigs.k8s.io/kustomize/pkg/internal/loadertest"

pkg/target/kusttarget_test.go

@@ -19,7 +19,7 @@ package target
 import (
 	"encoding/base64"
 	"reflect"
-	"sigs.k8s.io/kustomize/pkg/internal/k8sdeps"
+	"sigs.k8s.io/kustomize/internal/k8sdeps"
 	"strings"
 	"testing"