diff --git a/pkg/kubelet/kubeletconfig/BUILD b/pkg/kubelet/kubeletconfig/BUILD index e3f94317a7..ac2ccb3ead 100644 --- a/pkg/kubelet/kubeletconfig/BUILD +++ b/pkg/kubelet/kubeletconfig/BUILD @@ -21,9 +21,9 @@ go_library( "//pkg/kubelet/kubeletconfig/configfiles:go_default_library", "//pkg/kubelet/kubeletconfig/status:go_default_library", "//pkg/kubelet/kubeletconfig/util/equal:go_default_library", - "//pkg/kubelet/kubeletconfig/util/filesystem:go_default_library", "//pkg/kubelet/kubeletconfig/util/log:go_default_library", "//pkg/kubelet/kubeletconfig/util/panic:go_default_library", + "//pkg/util/filesystem:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", @@ -52,7 +52,6 @@ filegroup( "//pkg/kubelet/kubeletconfig/util/codec:all-srcs", "//pkg/kubelet/kubeletconfig/util/equal:all-srcs", "//pkg/kubelet/kubeletconfig/util/files:all-srcs", - "//pkg/kubelet/kubeletconfig/util/filesystem:all-srcs", "//pkg/kubelet/kubeletconfig/util/log:all-srcs", "//pkg/kubelet/kubeletconfig/util/panic:all-srcs", "//pkg/kubelet/kubeletconfig/util/test:all-srcs", diff --git a/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD b/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD index 44be634730..c5c69f5712 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD +++ b/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD @@ -16,8 +16,8 @@ go_test( deps = [ "//pkg/kubelet/kubeletconfig/checkpoint:go_default_library", "//pkg/kubelet/kubeletconfig/util/files:go_default_library", - "//pkg/kubelet/kubeletconfig/util/filesystem:go_default_library", "//pkg/kubelet/kubeletconfig/util/test:go_default_library", + "//pkg/util/filesystem:go_default_library", "//vendor/github.com/davecgh/go-spew/spew:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -35,8 +35,8 @@ go_library( deps = [ "//pkg/kubelet/kubeletconfig/checkpoint:go_default_library", "//pkg/kubelet/kubeletconfig/util/files:go_default_library", - "//pkg/kubelet/kubeletconfig/util/filesystem:go_default_library", "//pkg/kubelet/kubeletconfig/util/log:go_default_library", + "//pkg/util/filesystem:go_default_library", ], ) diff --git a/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore.go b/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore.go index 710683fdf2..a56c4ec165 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore.go +++ b/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint" utilfiles "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/files" - utilfs "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/filesystem" utillog "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/log" + utilfs "k8s.io/kubernetes/pkg/util/filesystem" ) const ( diff --git a/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go b/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go index 09c743dc37..939ffb2ad5 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go +++ b/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint" utilfiles "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/files" - utilfs "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/filesystem" utiltest "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/test" + utilfs "k8s.io/kubernetes/pkg/util/filesystem" ) const testCheckpointsDir = "/test-checkpoints-dir" diff --git a/pkg/kubelet/kubeletconfig/configfiles/BUILD b/pkg/kubelet/kubeletconfig/configfiles/BUILD index bba05666bb..90ea3d176b 100644 --- a/pkg/kubelet/kubeletconfig/configfiles/BUILD +++ b/pkg/kubelet/kubeletconfig/configfiles/BUILD @@ -13,7 +13,7 @@ go_library( "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", "//pkg/kubelet/kubeletconfig/util/codec:go_default_library", - "//pkg/kubelet/kubeletconfig/util/filesystem:go_default_library", + "//pkg/util/filesystem:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", ], ) @@ -40,8 +40,8 @@ go_test( "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", "//pkg/kubelet/apis/kubeletconfig/v1alpha1:go_default_library", "//pkg/kubelet/kubeletconfig/util/files:go_default_library", - "//pkg/kubelet/kubeletconfig/util/filesystem:go_default_library", "//pkg/kubelet/kubeletconfig/util/test:go_default_library", + "//pkg/util/filesystem:go_default_library", "//vendor/github.com/davecgh/go-spew/spew:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", ], diff --git a/pkg/kubelet/kubeletconfig/configfiles/configfiles.go b/pkg/kubelet/kubeletconfig/configfiles/configfiles.go index 68a118aea2..b3c763c162 100644 --- a/pkg/kubelet/kubeletconfig/configfiles/configfiles.go +++ b/pkg/kubelet/kubeletconfig/configfiles/configfiles.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" utilcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" - utilfs "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/filesystem" + utilfs "k8s.io/kubernetes/pkg/util/filesystem" ) const kubeletFile = "kubelet" diff --git a/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go b/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go index 2e8017a47c..af354907f3 100644 --- a/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go +++ b/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go @@ -29,8 +29,8 @@ import ( kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" kubeletconfigv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1alpha1" utilfiles "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/files" - utilfs "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/filesystem" utiltest "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/test" + utilfs "k8s.io/kubernetes/pkg/util/filesystem" ) func addFile(fs utilfs.Filesystem, path string, file string) error { diff --git a/pkg/kubelet/kubeletconfig/controller.go b/pkg/kubelet/kubeletconfig/controller.go index af08192a53..32b3145d1e 100644 --- a/pkg/kubelet/kubeletconfig/controller.go +++ b/pkg/kubelet/kubeletconfig/controller.go @@ -31,9 +31,9 @@ import ( "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/store" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/configfiles" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/status" - utilfs "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/filesystem" utillog "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/log" utilpanic "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/panic" + utilfs "k8s.io/kubernetes/pkg/util/filesystem" ) const ( diff --git a/pkg/kubelet/kubeletconfig/util/files/BUILD b/pkg/kubelet/kubeletconfig/util/files/BUILD index 9c4c8cffcb..f03ed24586 100644 --- a/pkg/kubelet/kubeletconfig/util/files/BUILD +++ b/pkg/kubelet/kubeletconfig/util/files/BUILD @@ -8,7 +8,7 @@ load( go_library( name = "go_default_library", srcs = ["files.go"], - deps = ["//pkg/kubelet/kubeletconfig/util/filesystem:go_default_library"], + deps = ["//pkg/util/filesystem:go_default_library"], ) filegroup( diff --git a/pkg/kubelet/kubeletconfig/util/files/files.go b/pkg/kubelet/kubeletconfig/util/files/files.go index 99c7de851d..b8d4653314 100644 --- a/pkg/kubelet/kubeletconfig/util/files/files.go +++ b/pkg/kubelet/kubeletconfig/util/files/files.go @@ -21,7 +21,7 @@ import ( "os" "path/filepath" - utilfs "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/filesystem" + utilfs "k8s.io/kubernetes/pkg/util/filesystem" ) const defaultPerm = 0666 diff --git a/pkg/util/BUILD b/pkg/util/BUILD index d8a7be64ef..da8c411f18 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -19,6 +19,7 @@ filegroup( "//pkg/util/ebtables:all-srcs", "//pkg/util/env:all-srcs", "//pkg/util/file:all-srcs", + "//pkg/util/filesystem:all-srcs", "//pkg/util/flock:all-srcs", "//pkg/util/goroutinemap:all-srcs", "//pkg/util/hash:all-srcs",