Merge pull request #80656 from seans3/move-kubectl-version

Move pkg/kubectl/version to staging

cmd/kubectl/BUILD

@@ -3,7 +3,7 @@ load(
     "go_binary",
     "go_library",
 )
-load("//pkg/kubectl/version:def.bzl", "version_x_defs")
+load("//staging/src/k8s.io/kubectl/pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kubectl",

hack/lib/version.sh

@@ -159,7 +159,7 @@ kube::version::ldflags() {
     ldflags+=(
       "-X '${KUBE_GO_PACKAGE}/pkg/version.${key}=${val}'"
       "-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/client-go/pkg/version.${key}=${val}'"
-      "-X '${KUBE_GO_PACKAGE}/pkg/kubectl/version.${key}=${val}'"
+      "-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/kubectl/pkg/version.${key}=${val}'"
       "-X '${KUBE_GO_PACKAGE}/cmd/kubeadm/app/version.${key}=${val}'"
     )
   }

hack/print-workspace-status.sh

@@ -30,7 +30,7 @@ kube::version::get_version_vars
 # Stamped rules will be retriggered by changes to stable-status.txt, but not by
 # changes to volatile-status.txt.
 # IMPORTANT: the camelCase vars should match the lists in hack/lib/version.sh
-# and pkg/version/def.bzl.
+# and staging/src/k8s.io/kubectl/pkg/version/def.bzl.
 cat <<EOF
 STABLE_BUILD_GIT_COMMIT ${KUBE_GIT_COMMIT-}
 STABLE_BUILD_SCM_STATUS ${KUBE_GIT_TREE_STATE-}

pkg/kubectl/BUILD

@@ -90,7 +90,6 @@ filegroup(
         "//pkg/kubectl/polymorphichelpers:all-srcs",
         "//pkg/kubectl/proxy:all-srcs",
         "//pkg/kubectl/util:all-srcs",
-        "//pkg/kubectl/version:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/kubectl/cmd/util/BUILD

@@ -15,7 +15,6 @@ go_library(
     deps = [
         "//pkg/kubectl/cmd/util/openapi:go_default_library",
         "//pkg/kubectl/cmd/util/openapi/validation:go_default_library",
-        "//pkg/kubectl/version:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
@@ -37,6 +36,7 @@ go_library(
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/version:go_default_library",
         "//vendor/github.com/evanphx/json-patch:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",

pkg/kubectl/cmd/util/kubectl_match_version.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/kubectl/pkg/scheme"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
-	"k8s.io/kubernetes/pkg/kubectl/version"
+	"k8s.io/kubectl/pkg/version"
 )
 
 const (

pkg/kubectl/cmd/version/BUILD

@@ -7,13 +7,13 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/kubectl/cmd/util:go_default_library",
-        "//pkg/kubectl/version:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/client-go/discovery:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/version:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/sigs.k8s.io/yaml:go_default_library",
     ],

pkg/kubectl/cmd/version/version.go

@@ -30,8 +30,8 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
+	"k8s.io/kubectl/pkg/version"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"k8s.io/kubernetes/pkg/kubectl/version"
 )
 
 // Version is a struct for version information

staging/src/k8s.io/kubectl/BUILD

@@ -17,6 +17,7 @@ filegroup(
         "//staging/src/k8s.io/kubectl/pkg/scheme:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/validation:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/version:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/kubectl/pkg/version/BUILD

@@ -6,7 +6,8 @@ go_library(
         "base.go",
         "version.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/version",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/version",
+    importpath = "k8s.io/kubectl/pkg/version",
     visibility = ["//visibility:public"],
     deps = ["//staging/src/k8s.io/apimachinery/pkg/version:go_default_library"],
 )

staging/src/k8s.io/kubectl/pkg/version/def.bzl

@@ -18,7 +18,7 @@
 #   go install ... -ldflags -X 'k8s.io/kubernetes/pkg/kubectl/cmd/version.gitMinor=12+' ...
 def version_x_defs():
     stamp_pkgs = [
-        "k8s.io/kubernetes/pkg/kubectl/version",
+        "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/version",
     ]
 
     # This should match the list of vars in kube::version::ldflags

vendor/modules.txt

@@ -1667,6 +1667,7 @@ k8s.io/kubectl/pkg/util/storage
 k8s.io/kubectl/pkg/util/templates
 k8s.io/kubectl/pkg/util/term
 k8s.io/kubectl/pkg/validation
+k8s.io/kubectl/pkg/version
 # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet
 k8s.io/kubelet/config/v1beta1
 # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers