diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 096889345a2..46c51c16fe5 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -17,7 +17,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/util:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -40,6 +39,7 @@ go_test( "//staging/src/k8s.io/client-go/scale/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", ], ) @@ -60,7 +60,6 @@ go_library( deps = [ "//pkg/kubectl/apps:go_default_library", "//pkg/kubectl/describe/versioned:go_default_library", - "//pkg/kubectl/util:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -85,6 +84,7 @@ go_library( "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/client-go/util/retry:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/slice:go_default_library", diff --git a/pkg/kubectl/cmd/logs/BUILD b/pkg/kubectl/cmd/logs/BUILD index af73988f10d..867b8c8a462 100644 --- a/pkg/kubectl/cmd/logs/BUILD +++ b/pkg/kubectl/cmd/logs/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", - "//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -16,6 +15,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/logs/logs.go b/pkg/kubectl/cmd/logs/logs.go index 573ed740cd1..d5837055e0d 100644 --- a/pkg/kubectl/cmd/logs/logs.go +++ b/pkg/kubectl/cmd/logs/logs.go @@ -33,10 +33,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/portforward/BUILD b/pkg/kubectl/cmd/portforward/BUILD index e1c2d67f269..f904de9a687 100644 --- a/pkg/kubectl/cmd/portforward/BUILD +++ b/pkg/kubectl/cmd/portforward/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", - "//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -18,6 +17,7 @@ go_library( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/portforward:go_default_library", "//staging/src/k8s.io/client-go/transport/spdy:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/portforward/portforward.go b/pkg/kubectl/cmd/portforward/portforward.go index 911f3a3213a..0ac89b3854d 100644 --- a/pkg/kubectl/cmd/portforward/portforward.go +++ b/pkg/kubectl/cmd/portforward/portforward.go @@ -36,10 +36,10 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/portforward" "k8s.io/client-go/transport/spdy" + "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/rollingupdate/BUILD b/pkg/kubectl/cmd/rollingupdate/BUILD index af4c4237de8..f3d85139a51 100644 --- a/pkg/kubectl/cmd/rollingupdate/BUILD +++ b/pkg/kubectl/cmd/rollingupdate/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -21,6 +20,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go index 5634c3dd84f..11419437bac 100644 --- a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go @@ -35,11 +35,11 @@ import ( "k8s.io/client-go/kubernetes" scaleclient "k8s.io/client-go/scale" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/generate/versioned/BUILD b/pkg/kubectl/generate/versioned/BUILD index 5fc17f72325..ec417acb519 100644 --- a/pkg/kubectl/generate/versioned/BUILD +++ b/pkg/kubectl/generate/versioned/BUILD @@ -26,7 +26,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/generate:go_default_library", - "//pkg/kubectl/util:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", @@ -48,6 +47,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/hash:go_default_library", ], ) diff --git a/pkg/kubectl/generate/versioned/configmap.go b/pkg/kubectl/generate/versioned/configmap.go index c99821a4135..94fa1138e00 100644 --- a/pkg/kubectl/generate/versioned/configmap.go +++ b/pkg/kubectl/generate/versioned/configmap.go @@ -27,9 +27,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation" + "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/hash" "k8s.io/kubernetes/pkg/kubectl/generate" - "k8s.io/kubernetes/pkg/kubectl/util" ) // ConfigMapGeneratorV1 supports stable generation of a configMap. diff --git a/pkg/kubectl/generate/versioned/secret.go b/pkg/kubectl/generate/versioned/secret.go index 962aae010e5..8a9632c66a3 100644 --- a/pkg/kubectl/generate/versioned/secret.go +++ b/pkg/kubectl/generate/versioned/secret.go @@ -26,9 +26,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation" + "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/hash" "k8s.io/kubernetes/pkg/kubectl/generate" - "k8s.io/kubernetes/pkg/kubectl/util" ) // SecretGeneratorV1 supports stable generation of an opaque secret diff --git a/pkg/kubectl/proxy/BUILD b/pkg/kubectl/proxy/BUILD index a272308651a..6ce53f6c157 100644 --- a/pkg/kubectl/proxy/BUILD +++ b/pkg/kubectl/proxy/BUILD @@ -21,11 +21,11 @@ go_library( srcs = ["proxy_server.go"], importpath = "k8s.io/kubernetes/pkg/kubectl/proxy", deps = [ - "//pkg/kubectl/util:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/proxy:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/transport:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/pkg/kubectl/proxy/proxy_server.go b/pkg/kubectl/proxy/proxy_server.go index 770bb7393ab..9f235968ec0 100644 --- a/pkg/kubectl/proxy/proxy_server.go +++ b/pkg/kubectl/proxy/proxy_server.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/transport" "k8s.io/klog" - "k8s.io/kubernetes/pkg/kubectl/util" + "k8s.io/kubectl/pkg/util" ) const ( diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 48a4f05052e..7a5686c4fb9 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -34,9 +34,9 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" scaleclient "k8s.io/client-go/scale" "k8s.io/client-go/util/retry" + "k8s.io/kubectl/pkg/util" deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubectl/pkg/util/podutils" - "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/utils/integer" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index e1514d86da3..ca20c70b76e 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -41,7 +41,7 @@ import ( manualfake "k8s.io/client-go/rest/fake" testcore "k8s.io/client-go/testing" "k8s.io/kubectl/pkg/scheme" - "k8s.io/kubernetes/pkg/kubectl/util" + "k8s.io/kubectl/pkg/util" ) func oldRc(replicas int, original int) *corev1.ReplicationController { diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 3da13341ccb..2f4449863e8 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -1,60 +1,3 @@ -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "pod_port.go", - "service_port.go", - "umask.go", - "umask_windows.go", - "util.go", - ], - importpath = "k8s.io/kubernetes/pkg/kubectl/util", - visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"], - deps = [ - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - ] + select({ - "@io_bazel_rules_go//go/platform:android": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:darwin": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:dragonfly": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:freebsd": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:linux": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:nacl": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:netbsd": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:openbsd": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:plan9": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "@io_bazel_rules_go//go/platform:solaris": [ - "//vendor/golang.org/x/sys/unix:go_default_library", - ], - "//conditions:default": [], - }), -) - filegroup( name = "package-srcs", srcs = glob(["**"]), @@ -71,17 +14,3 @@ filegroup( tags = ["automanaged"], visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"], ) - -go_test( - name = "go_default_test", - srcs = [ - "pod_port_test.go", - "service_port_test.go", - "util_test.go", - ], - embed = [":go_default_library"], - deps = [ - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - ], -) diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 0d636383989..671ee35d47e 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -11,22 +11,7 @@ filegroup( ":package-srcs", "//staging/src/k8s.io/kubectl/pkg/rawhttp:all-srcs", "//staging/src/k8s.io/kubectl/pkg/scheme:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/certificate:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/deployment:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/event:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/fieldpath:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/logs:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/qos:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/rbac:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/resource:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/slice:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/storage:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/templates:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/term:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util:all-srcs", "//staging/src/k8s.io/kubectl/pkg/validation:all-srcs", ], tags = ["automanaged"], diff --git a/staging/src/k8s.io/kubectl/pkg/util/BUILD b/staging/src/k8s.io/kubectl/pkg/util/BUILD new file mode 100644 index 00000000000..134e6011ab1 --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/util/BUILD @@ -0,0 +1,99 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = [ + "pod_port.go", + "service_port.go", + "umask.go", + "umask_windows.go", + "util.go", + ], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util", + importpath = "k8s.io/kubectl/pkg/util", + visibility = ["//visibility:public"], + deps = [ + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + ] + select({ + "@io_bazel_rules_go//go/platform:android": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:darwin": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:dragonfly": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:freebsd": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:linux": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:nacl": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:netbsd": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:openbsd": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:plan9": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "@io_bazel_rules_go//go/platform:solaris": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + ], + "//conditions:default": [], + }), +) + +go_test( + name = "go_default_test", + srcs = [ + "pod_port_test.go", + "service_port_test.go", + "util_test.go", + ], + embed = [":go_default_library"], + deps = [ + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/certificate:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/deployment:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/event:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/fieldpath:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/logs:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/qos:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/rbac:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/resource:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/slice:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/storage:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/templates:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/term:all-srcs", + ], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/kubectl/util/pod_port.go b/staging/src/k8s.io/kubectl/pkg/util/pod_port.go similarity index 100% rename from pkg/kubectl/util/pod_port.go rename to staging/src/k8s.io/kubectl/pkg/util/pod_port.go diff --git a/pkg/kubectl/util/pod_port_test.go b/staging/src/k8s.io/kubectl/pkg/util/pod_port_test.go similarity index 100% rename from pkg/kubectl/util/pod_port_test.go rename to staging/src/k8s.io/kubectl/pkg/util/pod_port_test.go diff --git a/pkg/kubectl/util/service_port.go b/staging/src/k8s.io/kubectl/pkg/util/service_port.go similarity index 100% rename from pkg/kubectl/util/service_port.go rename to staging/src/k8s.io/kubectl/pkg/util/service_port.go diff --git a/pkg/kubectl/util/service_port_test.go b/staging/src/k8s.io/kubectl/pkg/util/service_port_test.go similarity index 100% rename from pkg/kubectl/util/service_port_test.go rename to staging/src/k8s.io/kubectl/pkg/util/service_port_test.go diff --git a/pkg/kubectl/util/umask.go b/staging/src/k8s.io/kubectl/pkg/util/umask.go similarity index 100% rename from pkg/kubectl/util/umask.go rename to staging/src/k8s.io/kubectl/pkg/util/umask.go diff --git a/pkg/kubectl/util/umask_windows.go b/staging/src/k8s.io/kubectl/pkg/util/umask_windows.go similarity index 100% rename from pkg/kubectl/util/umask_windows.go rename to staging/src/k8s.io/kubectl/pkg/util/umask_windows.go diff --git a/pkg/kubectl/util/util.go b/staging/src/k8s.io/kubectl/pkg/util/util.go similarity index 100% rename from pkg/kubectl/util/util.go rename to staging/src/k8s.io/kubectl/pkg/util/util.go diff --git a/pkg/kubectl/util/util_test.go b/staging/src/k8s.io/kubectl/pkg/util/util_test.go similarity index 100% rename from pkg/kubectl/util/util_test.go rename to staging/src/k8s.io/kubectl/pkg/util/util_test.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 56d9f473919..d75d1bf5a7e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1642,6 +1642,7 @@ k8s.io/kube-scheduler/config/v1alpha1 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl k8s.io/kubectl/pkg/rawhttp k8s.io/kubectl/pkg/scheme +k8s.io/kubectl/pkg/util k8s.io/kubectl/pkg/util/certificate k8s.io/kubectl/pkg/util/deployment k8s.io/kubectl/pkg/util/event