Drop the util package.

pkg/commands/addpatch.go

@@ -24,7 +24,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 )
 
 type addPatchOptions struct {

pkg/commands/addpatch_test.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 )
 
 const (

pkg/commands/addresource.go

@@ -24,7 +24,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 )
 
 type addResourceOptions struct {

pkg/commands/addresource_test.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 )
 
 const (

pkg/commands/build.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/kubernetes-sigs/kustomize/pkg/app"
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
 )
 
 type buildOptions struct {

pkg/commands/build_test.go

@@ -28,7 +28,7 @@ import (
 	"github.com/ghodss/yaml"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 

pkg/commands/commands.go

@@ -21,7 +21,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/kubernetes-sigs/kustomize/version"
 	"github.com/spf13/cobra"
 )

pkg/commands/configmap.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/kubernetes-sigs/kustomize/pkg/configmapandsecret"
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/kubernetes-sigs/kustomize/pkg/types"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
 )
 
 func newCmdAddConfigMap(errOut io.Writer, fsys fs.FileSystem) *cobra.Command {

pkg/commands/configmap_test.go

@@ -19,8 +19,8 @@ package commands
 import (
 	"testing"
 
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/kubernetes-sigs/kustomize/pkg/types"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
 )
 
 func TestNewAddConfigMapIsNotNil(t *testing.T) {

pkg/commands/diff.go

@@ -26,8 +26,8 @@ import (
 	"github.com/kubernetes-sigs/kustomize/pkg/app"
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
 	"github.com/kubernetes-sigs/kustomize/pkg/diff"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
 )
 
 type diffOptions struct {

pkg/commands/diff_test.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 

pkg/commands/init.go

@@ -23,7 +23,7 @@ import (
 	"errors"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/spf13/cobra"
 )
 

pkg/commands/set_name_prefix.go

@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 )
 
 type setNamePrefixOptions struct {

pkg/commands/set_name_prefix_test.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 )
 
 const (

pkg/commands/util.go

@@ -25,9 +25,9 @@ import (
 	"github.com/ghodss/yaml"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	interror "github.com/kubernetes-sigs/kustomize/pkg/internal/error"
 	"github.com/kubernetes-sigs/kustomize/pkg/types"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
 )
 
 type kustomizationFile struct {

pkg/commands/util_test.go

@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/constants"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/kubernetes-sigs/kustomize/pkg/types"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
 )
 
 func TestWriteAndRead(t *testing.T) {

pkg/loader/fileloader.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 )
 
 const currentDir = "."

pkg/loader/loader_test.go

@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 )
 
 func initializeRootLoader(fakefs fs.FileSystem) Loader {

pkg/loader/loadertest/fake_loader.go

@@ -19,8 +19,8 @@ package loadertest
 import (
 	"os"
 
+	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
 )
 
 // FakeLoader encapsulates the delegate Loader and the fake file system.