diff --git a/build/kazel_generated.bzl b/build/kazel_generated.bzl index 687e3020b7a..a65deb4af43 100644 --- a/build/kazel_generated.bzl +++ b/build/kazel_generated.bzl @@ -39,7 +39,6 @@ tags_values_pkgs = {"openapi-gen": { "pkg/apis/abac/v0", "pkg/apis/abac/v1beta1", "pkg/apis/auditregistration", - "pkg/version", "staging/src/k8s.io/api/admissionregistration/v1", "staging/src/k8s.io/api/admissionregistration/v1beta1", "staging/src/k8s.io/api/apps/v1", @@ -116,7 +115,6 @@ tags_pkgs_values = {"openapi-gen": { "pkg/apis/abac/v0": ["true"], "pkg/apis/abac/v1beta1": ["true"], "pkg/apis/auditregistration": ["true"], - "pkg/version": ["true"], "staging/src/k8s.io/api/admission/v1": ["false"], "staging/src/k8s.io/api/admission/v1beta1": ["false"], "staging/src/k8s.io/api/admissionregistration/v1": ["true"], diff --git a/cmd/cloud-controller-manager/BUILD b/cmd/cloud-controller-manager/BUILD index cc25f935b33..b9ff93fccdf 100644 --- a/cmd/cloud-controller-manager/BUILD +++ b/cmd/cloud-controller-manager/BUILD @@ -5,7 +5,7 @@ load( "go_binary", "go_library", ) -load("//pkg/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "cloud-controller-manager", @@ -23,6 +23,7 @@ go_library( "//pkg/cloudprovider/providers:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library", + "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library", ], ) diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index bf877959422..37550a9f744 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -18,7 +18,6 @@ go_library( "//pkg/features:go_default_library", "//pkg/util/configz:go_default_library", "//pkg/util/flag:go_default_library", - "//pkg/version/verflag:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", @@ -32,6 +31,7 @@ go_library( "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", + "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/net:go_default_library", diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index f77262d484f..0c47ca3b4a1 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -38,13 +38,13 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/version" + "k8s.io/component-base/version/verflag" "k8s.io/klog" cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config" "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app" "k8s.io/kubernetes/pkg/util/configz" utilflag "k8s.io/kubernetes/pkg/util/flag" - "k8s.io/kubernetes/pkg/version/verflag" ) const ( diff --git a/cmd/cloud-controller-manager/controller-manager.go b/cmd/cloud-controller-manager/controller-manager.go index a165d0b63ec..eb9c6698938 100644 --- a/cmd/cloud-controller-manager/controller-manager.go +++ b/cmd/cloud-controller-manager/controller-manager.go @@ -27,6 +27,7 @@ import ( "k8s.io/component-base/logs" "k8s.io/kubernetes/cmd/cloud-controller-manager/app" + _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration // NOTE: Importing all in-tree cloud-providers is not required when // implementing an out-of-tree cloud-provider. _ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins diff --git a/cmd/hyperkube/BUILD b/cmd/hyperkube/BUILD index df5d3c2254c..a3f4dd22b2b 100644 --- a/cmd/hyperkube/BUILD +++ b/cmd/hyperkube/BUILD @@ -5,7 +5,7 @@ load( go_binary = "go_binary_conditional_pure", ) load("@io_bazel_rules_go//go:def.bzl", "go_library") -load("//pkg/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "hyperkube", @@ -25,10 +25,10 @@ go_library( "//cmd/kube-scheduler/app:go_default_library", "//cmd/kubelet/app:go_default_library", "//pkg/kubectl/cmd:go_default_library", - "//pkg/version/prometheus:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/restclient:go_default_library", + "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go index 58b98d1c24f..9b606bd139e 100644 --- a/cmd/hyperkube/main.go +++ b/cmd/hyperkube/main.go @@ -32,6 +32,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" _ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration + _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app" kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app" kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app" @@ -39,7 +40,6 @@ import ( kubescheduler "k8s.io/kubernetes/cmd/kube-scheduler/app" kubelet "k8s.io/kubernetes/cmd/kubelet/app" kubectl "k8s.io/kubernetes/pkg/kubectl/cmd" - _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration ) func main() { diff --git a/cmd/kube-apiserver/BUILD b/cmd/kube-apiserver/BUILD index a2c7666db2d..7b8f3b22e68 100644 --- a/cmd/kube-apiserver/BUILD +++ b/cmd/kube-apiserver/BUILD @@ -5,7 +5,7 @@ load( "go_binary", "go_library", ) -load("//pkg/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "kube-apiserver", diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index 660766736c9..1fdfe1ba015 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -30,7 +30,6 @@ go_library( "//pkg/registry/rbac/rest:go_default_library", "//pkg/serviceaccount:go_default_library", "//pkg/util/flag:go_default_library", - "//pkg/version/verflag:go_default_library", "//plugin/pkg/auth/authenticator/token/bootstrap:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", @@ -67,6 +66,7 @@ go_library( "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", + "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library", diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index cb4150a6ddf..f014af7e752 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -60,6 +60,7 @@ import ( "k8s.io/component-base/cli/globalflag" _ "k8s.io/component-base/metrics/prometheus/workqueue" // for workqueue metric registration "k8s.io/component-base/version" + "k8s.io/component-base/version/verflag" "k8s.io/klog" aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver" aggregatorscheme "k8s.io/kube-aggregator/pkg/apiserver/scheme" @@ -82,7 +83,6 @@ import ( rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest" "k8s.io/kubernetes/pkg/serviceaccount" utilflag "k8s.io/kubernetes/pkg/util/flag" - "k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/bootstrap" ) diff --git a/cmd/kube-controller-manager/BUILD b/cmd/kube-controller-manager/BUILD index b77adbe6a7e..f72156e9676 100644 --- a/cmd/kube-controller-manager/BUILD +++ b/cmd/kube-controller-manager/BUILD @@ -5,7 +5,7 @@ load( "go_binary", "go_library", ) -load("//pkg/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "kube-controller-manager", @@ -22,6 +22,7 @@ go_library( "//cmd/kube-controller-manager/app:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library", + "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library", ], ) diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index e1ac4f3b5a7..b21230fb345 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -87,8 +87,6 @@ go_library( "//pkg/util/configz:go_default_library", "//pkg/util/flag:go_default_library", "//pkg/util/metrics:go_default_library", - "//pkg/version:go_default_library", - "//pkg/version/verflag:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/awsebs:go_default_library", "//pkg/volume/azure_dd:go_default_library", @@ -141,6 +139,8 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", + "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1:go_default_library", "//staging/src/k8s.io/metrics/pkg/client/custom_metrics:go_default_library", "//staging/src/k8s.io/metrics/pkg/client/external_metrics:go_default_library", diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 18620607016..8a1b6cea5e2 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -56,6 +56,8 @@ import ( cloudprovider "k8s.io/cloud-provider" cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" + "k8s.io/component-base/version" + "k8s.io/component-base/version/verflag" "k8s.io/klog" genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app" "k8s.io/kubernetes/cmd/kube-controller-manager/app/config" @@ -67,8 +69,6 @@ import ( "k8s.io/kubernetes/pkg/serviceaccount" "k8s.io/kubernetes/pkg/util/configz" utilflag "k8s.io/kubernetes/pkg/util/flag" - "k8s.io/kubernetes/pkg/version" - "k8s.io/kubernetes/pkg/version/verflag" ) const ( diff --git a/cmd/kube-controller-manager/controller-manager.go b/cmd/kube-controller-manager/controller-manager.go index fdb473aee1c..4d8fb778e94 100644 --- a/cmd/kube-controller-manager/controller-manager.go +++ b/cmd/kube-controller-manager/controller-manager.go @@ -27,6 +27,7 @@ import ( "k8s.io/component-base/logs" _ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugin + _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration "k8s.io/kubernetes/cmd/kube-controller-manager/app" ) diff --git a/cmd/kube-proxy/BUILD b/cmd/kube-proxy/BUILD index ed4156c8740..225f757901a 100644 --- a/cmd/kube-proxy/BUILD +++ b/cmd/kube-proxy/BUILD @@ -5,7 +5,7 @@ load( "go_binary", "go_library", ) -load("//pkg/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "kube-proxy", @@ -23,6 +23,7 @@ go_library( "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/restclient:go_default_library", + "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], ) diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD index f81a1dee004..5edb55efe41 100644 --- a/cmd/kube-proxy/app/BUILD +++ b/cmd/kube-proxy/app/BUILD @@ -42,8 +42,6 @@ go_library( "//pkg/util/mount:go_default_library", "//pkg/util/oom:go_default_library", "//pkg/util/sysctl:go_default_library", - "//pkg/version:go_default_library", - "//pkg/version/verflag: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", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", @@ -65,6 +63,8 @@ go_library( "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/config:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", + "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/kube-proxy/config/v1alpha1:go_default_library", "//vendor/github.com/fsnotify/fsnotify:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 1b95d0ea4ae..83940716eb1 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -53,6 +53,8 @@ import ( cliflag "k8s.io/component-base/cli/flag" componentbaseconfig "k8s.io/component-base/config" "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/component-base/version" + "k8s.io/component-base/version/verflag" "k8s.io/klog" "k8s.io/kube-proxy/config/v1alpha1" api "k8s.io/kubernetes/pkg/apis/core" @@ -77,8 +79,6 @@ import ( utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilipvs "k8s.io/kubernetes/pkg/util/ipvs" "k8s.io/kubernetes/pkg/util/oom" - "k8s.io/kubernetes/pkg/version" - "k8s.io/kubernetes/pkg/version/verflag" "k8s.io/utils/exec" utilpointer "k8s.io/utils/pointer" ) diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index 4b8a52c53c7..8e3002c2cc0 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -27,6 +27,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" _ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration + _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration "k8s.io/kubernetes/cmd/kube-proxy/app" ) diff --git a/cmd/kube-scheduler/BUILD b/cmd/kube-scheduler/BUILD index 72f6c49af5e..c7d6673f362 100644 --- a/cmd/kube-scheduler/BUILD +++ b/cmd/kube-scheduler/BUILD @@ -5,7 +5,7 @@ load( "go_binary", "go_library", ) -load("//pkg/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "kube-scheduler", diff --git a/cmd/kube-scheduler/app/BUILD b/cmd/kube-scheduler/app/BUILD index b6f53ecc125..fd5c7c0ca6b 100644 --- a/cmd/kube-scheduler/app/BUILD +++ b/cmd/kube-scheduler/app/BUILD @@ -21,8 +21,6 @@ go_library( "//pkg/scheduler/metrics:go_default_library", "//pkg/util/configz:go_default_library", "//pkg/util/flag:go_default_library", - "//pkg/version:go_default_library", - "//pkg/version/verflag:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apiserver/pkg/authentication/authenticator:go_default_library", "//staging/src/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library", @@ -38,6 +36,8 @@ go_library( "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", + "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index 05cb13bafa4..2b5be697607 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -42,6 +42,8 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/component-base/version" + "k8s.io/component-base/version/verflag" "k8s.io/klog" schedulerserverconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config" "k8s.io/kubernetes/cmd/kube-scheduler/app/options" @@ -54,8 +56,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/metrics" "k8s.io/kubernetes/pkg/util/configz" utilflag "k8s.io/kubernetes/pkg/util/flag" - "k8s.io/kubernetes/pkg/version" - "k8s.io/kubernetes/pkg/version/verflag" ) // Option configures a framework.Registry. diff --git a/cmd/kubeadm/BUILD b/cmd/kubeadm/BUILD index eace674f7c8..ae6e741f54e 100644 --- a/cmd/kubeadm/BUILD +++ b/cmd/kubeadm/BUILD @@ -5,7 +5,7 @@ load( "go_binary", "go_library", ) -load("//cmd/kubeadm/app/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "kubeadm", diff --git a/cmd/kubeadm/app/BUILD b/cmd/kubeadm/app/BUILD index d2d41fd7663..7a1263a5875 100644 --- a/cmd/kubeadm/app/BUILD +++ b/cmd/kubeadm/app/BUILD @@ -52,7 +52,6 @@ filegroup( "//cmd/kubeadm/app/phases/uploadconfig:all-srcs", "//cmd/kubeadm/app/preflight:all-srcs", "//cmd/kubeadm/app/util:all-srcs", - "//cmd/kubeadm/app/version:all-srcs", ], tags = ["automanaged"], ) diff --git a/cmd/kubeadm/app/cmd/BUILD b/cmd/kubeadm/app/cmd/BUILD index 17da3608e5c..611a9cbdad5 100644 --- a/cmd/kubeadm/app/cmd/BUILD +++ b/cmd/kubeadm/app/cmd/BUILD @@ -47,7 +47,6 @@ go_library( "//cmd/kubeadm/app/util/config:go_default_library", "//cmd/kubeadm/app/util/kubeconfig:go_default_library", "//cmd/kubeadm/app/util/runtime:go_default_library", - "//cmd/kubeadm/app/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/duration:go_default_library", @@ -58,6 +57,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library", "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library", "//staging/src/k8s.io/cluster-bootstrap/token/util:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/lithammer/dedent:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/cmd/kubeadm/app/cmd/phases/BUILD b/cmd/kubeadm/app/cmd/phases/BUILD index ffabe5e1a2a..974a28b372a 100644 --- a/cmd/kubeadm/app/cmd/phases/BUILD +++ b/cmd/kubeadm/app/cmd/phases/BUILD @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library", - "//cmd/kubeadm/app/version:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", ], ) @@ -17,7 +17,7 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library", - "//cmd/kubeadm/app/version:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", ], ) diff --git a/cmd/kubeadm/app/cmd/phases/util.go b/cmd/kubeadm/app/cmd/phases/util.go index 017c65ebf13..0cd39873f25 100644 --- a/cmd/kubeadm/app/cmd/phases/util.go +++ b/cmd/kubeadm/app/cmd/phases/util.go @@ -17,8 +17,8 @@ limitations under the License. package phases import ( + "k8s.io/component-base/version" kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/version" ) // SetKubernetesVersion gets the current Kubeadm version and sets it as KubeadmVersion in the config, diff --git a/cmd/kubeadm/app/cmd/phases/util_test.go b/cmd/kubeadm/app/cmd/phases/util_test.go index 39523c65f55..6e06c717eac 100644 --- a/cmd/kubeadm/app/cmd/phases/util_test.go +++ b/cmd/kubeadm/app/cmd/phases/util_test.go @@ -19,8 +19,8 @@ package phases import ( "testing" + "k8s.io/component-base/version" kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/version" ) func TestSetKubernetesVersion(t *testing.T) { diff --git a/cmd/kubeadm/app/cmd/version.go b/cmd/kubeadm/app/cmd/version.go index 2d20776d41e..d58298333aa 100644 --- a/cmd/kubeadm/app/cmd/version.go +++ b/cmd/kubeadm/app/cmd/version.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/yaml" apimachineryversion "k8s.io/apimachinery/pkg/version" - "k8s.io/kubernetes/cmd/kubeadm/app/version" + "k8s.io/component-base/version" ) // Version provides the version information of kubeadm. diff --git a/cmd/kubeadm/app/phases/upgrade/BUILD b/cmd/kubeadm/app/phases/upgrade/BUILD index d90c2ec5345..60defc2805f 100644 --- a/cmd/kubeadm/app/phases/upgrade/BUILD +++ b/cmd/kubeadm/app/phases/upgrade/BUILD @@ -35,7 +35,6 @@ go_library( "//cmd/kubeadm/app/util/dryrun:go_default_library", "//cmd/kubeadm/app/util/etcd:go_default_library", "//cmd/kubeadm/app/util/staticpod:go_default_library", - "//cmd/kubeadm/app/version:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -45,6 +44,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/coredns/corefile-migration/migration:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/cmd/kubeadm/app/phases/upgrade/versiongetter.go b/cmd/kubeadm/app/phases/upgrade/versiongetter.go index 2cbd8195ed1..775da36b70d 100644 --- a/cmd/kubeadm/app/phases/upgrade/versiongetter.go +++ b/cmd/kubeadm/app/phases/upgrade/versiongetter.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" versionutil "k8s.io/apimachinery/pkg/util/version" clientset "k8s.io/client-go/kubernetes" + "k8s.io/component-base/version" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/cmd/kubeadm/app/version" ) // VersionGetter defines an interface for fetching different versions. diff --git a/cmd/kubeadm/app/preflight/BUILD b/cmd/kubeadm/app/preflight/BUILD index 10aa667d20e..ce9bd369dc7 100644 --- a/cmd/kubeadm/app/preflight/BUILD +++ b/cmd/kubeadm/app/preflight/BUILD @@ -24,11 +24,11 @@ go_library( "//cmd/kubeadm/app/util/initsystem:go_default_library", "//cmd/kubeadm/app/util/runtime:go_default_library", "//cmd/kubeadm/app/util/system:go_default_library", - "//cmd/kubeadm/app/version:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/PuerkitoBio/purell:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index 21e2694d35f..8df04ce0f3c 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -39,6 +39,7 @@ import ( netutil "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" versionutil "k8s.io/apimachinery/pkg/util/version" + kubeadmversion "k8s.io/component-base/version" "k8s.io/klog" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" @@ -46,7 +47,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/util/initsystem" utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" "k8s.io/kubernetes/cmd/kubeadm/app/util/system" - kubeadmversion "k8s.io/kubernetes/cmd/kubeadm/app/version" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" utilsexec "k8s.io/utils/exec" utilsnet "k8s.io/utils/net" diff --git a/cmd/kubeadm/app/util/BUILD b/cmd/kubeadm/app/util/BUILD index 9a50c4c2e30..bff571735c8 100644 --- a/cmd/kubeadm/app/util/BUILD +++ b/cmd/kubeadm/app/util/BUILD @@ -20,7 +20,6 @@ go_library( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", - "//cmd/kubeadm/app/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", @@ -30,6 +29,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/yaml:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", diff --git a/cmd/kubeadm/app/util/version.go b/cmd/kubeadm/app/util/version.go index 80e75d5a7d4..6ed298d2fda 100644 --- a/cmd/kubeadm/app/util/version.go +++ b/cmd/kubeadm/app/util/version.go @@ -28,9 +28,9 @@ import ( netutil "k8s.io/apimachinery/pkg/util/net" versionutil "k8s.io/apimachinery/pkg/util/version" + pkgversion "k8s.io/component-base/version" "k8s.io/klog" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - pkgversion "k8s.io/kubernetes/cmd/kubeadm/app/version" ) const ( diff --git a/cmd/kubeadm/app/version/BUILD b/cmd/kubeadm/app/version/BUILD deleted file mode 100644 index b18bcbff7f1..00000000000 --- a/cmd/kubeadm/app/version/BUILD +++ /dev/null @@ -1,26 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "base.go", - "version.go", - ], - importpath = "k8s.io/kubernetes/cmd/kubeadm/app/version", - visibility = ["//visibility:public"], - deps = ["//staging/src/k8s.io/apimachinery/pkg/version:go_default_library"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/cmd/kubeadm/app/version/base.go b/cmd/kubeadm/app/version/base.go deleted file mode 100644 index c84c6d2d1c5..00000000000 --- a/cmd/kubeadm/app/version/base.go +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2019 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package version - -// Base version information. -// -// This is the fallback data used when version information from git is not -// provided via go ldflags. It provides an approximation of the Kubernetes -// version for ad-hoc builds (e.g. `go build`) that cannot get the version -// information from git. -// -// If you are looking at these fields in the git tree, they look -// strange. They are modified on the fly by the build process. The -// in-tree values are dummy values used for "git archive", which also -// works for GitHub tar downloads. -// -// When releasing a new Kubernetes version, this file is updated by -// build/mark_new_version.sh to reflect the new version, and then a -// git annotated tag (using format vX.Y where X == Major version and Y -// == Minor version) is created to point to the commit that updates -// pkg/version/base.go -var ( - // TODO: Deprecate gitMajor and gitMinor, use only gitVersion - // instead. First step in deprecation, keep the fields but make - // them irrelevant. (Next we'll take it out, which may muck with - // scripts consuming the kubectl version output - but most of - // these should be looking at gitVersion already anyways.) - gitMajor string // major version, always numeric - gitMinor string // minor version, numeric possibly followed by "+" - - // semantic version, derived by build scripts (see - // https://github.com/kubernetes/community/blob/master/contributors/design-proposals/release/versioning.md - // for a detailed discussion of this field) - // - // TODO: This field is still called "gitVersion" for legacy - // reasons. For prerelease versions, the build metadata on the - // semantic version is a git hash, but the version itself is no - // longer the direct output of "git describe", but a slight - // translation to be semver compliant. - - // NOTE: The $Format strings are replaced during 'git archive' thanks to the - // companion .gitattributes file containing 'export-subst' in this same - // directory. See also https://git-scm.com/docs/gitattributes - gitVersion = "v0.0.0-master+$Format:%h$" - gitCommit = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD) - gitTreeState = "" // state of git tree, either "clean" or "dirty" - - buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ') -) diff --git a/cmd/kubeadm/app/version/def.bzl b/cmd/kubeadm/app/version/def.bzl deleted file mode 100644 index 5a810a87860..00000000000 --- a/cmd/kubeadm/app/version/def.bzl +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2017 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Implements hack/lib/version.sh's kube::version::ldflags() for Bazel. -# Modifies the version variables (stamp_vars:buildDate, gitCommit, ...) -# Example go build command with ldflags: -# go install ... -ldflags -X 'k8s.io/kubernetes/cmd/kubeadm/app/version.gitMinor=12+' ... -def version_x_defs(): - stamp_pkgs = [ - "k8s.io/kubernetes/cmd/kubeadm/app/version", - ] - - # This should match the list of vars in kube::version::ldflags - # It should also match the list of vars set in hack/print-workspace-status.sh. - stamp_vars = [ - "buildDate", - "gitCommit", - "gitMajor", - "gitMinor", - "gitTreeState", - "gitVersion", - ] - - # Generate the cross-product. - x_defs = {} - for pkg in stamp_pkgs: - for var in stamp_vars: - x_defs["%s.%s" % (pkg, var)] = "{%s}" % var - return x_defs diff --git a/cmd/kubeadm/app/version/version.go b/cmd/kubeadm/app/version/version.go deleted file mode 100644 index d1e76dc00e0..00000000000 --- a/cmd/kubeadm/app/version/version.go +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2019 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package version - -import ( - "fmt" - "runtime" - - apimachineryversion "k8s.io/apimachinery/pkg/version" -) - -// Get returns the overall codebase version. It's for detecting -// what code a binary was built from. -func Get() apimachineryversion.Info { - // These variables typically come from -ldflags settings and in - // their absence fallback to the settings in ./base.go - return apimachineryversion.Info{ - Major: gitMajor, - Minor: gitMinor, - GitVersion: gitVersion, - GitCommit: gitCommit, - GitTreeState: gitTreeState, - BuildDate: buildDate, - GoVersion: runtime.Version(), - Compiler: runtime.Compiler, - Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), - } -} diff --git a/cmd/kubectl/BUILD b/cmd/kubectl/BUILD index ea75a05546a..0f6a8cd3cbb 100644 --- a/cmd/kubectl/BUILD +++ b/cmd/kubectl/BUILD @@ -3,7 +3,7 @@ load( "go_binary", "go_library", ) -load("//staging/src/k8s.io/kubectl/pkg/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "kubectl", diff --git a/cmd/kubelet/BUILD b/cmd/kubelet/BUILD index 1f628f59b77..b98345e9a60 100644 --- a/cmd/kubelet/BUILD +++ b/cmd/kubelet/BUILD @@ -5,7 +5,7 @@ load( go_binary = "go_binary_conditional_pure", ) load("@io_bazel_rules_go//go:def.bzl", "go_library") -load("//pkg/version:def.bzl", "version_x_defs") +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_binary( name = "kubelet", @@ -19,9 +19,9 @@ go_library( importpath = "k8s.io/kubernetes/cmd/kubelet", deps = [ "//cmd/kubelet/app:go_default_library", - "//pkg/version/prometheus:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/restclient:go_default_library", + "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library", ], ) diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index fc364aa548f..7d723980cd7 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -78,8 +78,6 @@ go_library( "//pkg/util/node:go_default_library", "//pkg/util/oom:go_default_library", "//pkg/util/rlimit:go_default_library", - "//pkg/version:go_default_library", - "//pkg/version/verflag:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/awsebs:go_default_library", "//pkg/volume/azure_dd:go_default_library", @@ -139,6 +137,8 @@ go_library( "//staging/src/k8s.io/client-go/util/keyutil:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", + "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", "//vendor/github.com/coreos/go-systemd/daemon:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/cmd/kubelet/app/options/BUILD b/cmd/kubelet/app/options/BUILD index e76c2e10898..39c3a6b4c36 100644 --- a/cmd/kubelet/app/options/BUILD +++ b/cmd/kubelet/app/options/BUILD @@ -32,12 +32,12 @@ go_library( "//pkg/master/ports:go_default_library", "//pkg/util/flag:go_default_library", "//pkg/util/taints:go_default_library", - "//pkg/version/verflag:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", + "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/cmd/kubelet/app/options/globalflags.go b/cmd/kubelet/app/options/globalflags.go index e8853e92701..281491384f7 100644 --- a/cmd/kubelet/app/options/globalflags.go +++ b/cmd/kubelet/app/options/globalflags.go @@ -26,8 +26,8 @@ import ( // libs that provide registration functions "k8s.io/component-base/logs" + "k8s.io/component-base/version/verflag" "k8s.io/klog" - "k8s.io/kubernetes/pkg/version/verflag" // ensure libs have a chance to globally register their flags _ "k8s.io/kubernetes/pkg/credentialprovider/azure" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index e497bdcd838..f191b9f9c0b 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -60,6 +60,8 @@ import ( "k8s.io/client-go/util/keyutil" cloudprovider "k8s.io/cloud-provider" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/component-base/version" + "k8s.io/component-base/version/verflag" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -95,8 +97,6 @@ import ( nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/rlimit" - "k8s.io/kubernetes/pkg/version" - "k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/util/subpath" "k8s.io/utils/exec" diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index 5fc2fd5296b..ca4e759b27c 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -27,8 +27,8 @@ import ( "k8s.io/component-base/logs" _ "k8s.io/component-base/metrics/prometheus/restclient" + _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration "k8s.io/kubernetes/cmd/kubelet/app" - _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration ) func main() { diff --git a/cmd/kubemark/BUILD b/cmd/kubemark/BUILD index 224b12c8d8b..f5a72875071 100644 --- a/cmd/kubemark/BUILD +++ b/cmd/kubemark/BUILD @@ -26,8 +26,6 @@ go_library( "//pkg/master/ports:go_default_library", "//pkg/util/iptables/testing:go_default_library", "//pkg/util/sysctl/testing:go_default_library", - "//pkg/version/prometheus:go_default_library", - "//pkg/version/verflag:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", @@ -38,6 +36,8 @@ go_library( "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/restclient:go_default_library", + "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library", + "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index e931bdc4f6d..77165dedbc0 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -38,6 +38,8 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" _ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration + _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration + "k8s.io/component-base/version/verflag" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/features" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" @@ -48,8 +50,6 @@ import ( "k8s.io/kubernetes/pkg/master/ports" fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing" fakesysctl "k8s.io/kubernetes/pkg/util/sysctl/testing" - _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration - "k8s.io/kubernetes/pkg/version/verflag" fakeexec "k8s.io/utils/exec/testing" ) diff --git a/hack/.golint_failures b/hack/.golint_failures index fe301fb3c2d..cbd5b3e491a 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -245,7 +245,6 @@ pkg/util/rlimit pkg/util/selinux pkg/util/sysctl/testing pkg/util/taints -pkg/version/verflag pkg/volume pkg/volume/azure_dd pkg/volume/azure_file @@ -489,6 +488,7 @@ staging/src/k8s.io/code-generator/cmd/lister-gen/generators staging/src/k8s.io/component-base/cli/flag staging/src/k8s.io/component-base/config/v1alpha1 staging/src/k8s.io/component-base/featuregate +staging/src/k8s.io/component-base/version/verflag staging/src/k8s.io/cri-api/pkg/apis/testing staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 diff --git a/hack/lib/version.sh b/hack/lib/version.sh index e3a093e1f6f..0a3342378c4 100644 --- a/hack/lib/version.sh +++ b/hack/lib/version.sh @@ -155,12 +155,9 @@ kube::version::ldflags() { function add_ldflag() { local key=${1} local val=${2} - # If you update these, also update the list pkg/version/def.bzl. + # If you update these, also update the list component-base/version/def.bzl. 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}/vendor/k8s.io/kubectl/pkg/version.${key}=${val}'" - "-X '${KUBE_GO_PACKAGE}/cmd/kubeadm/app/version.${key}=${val}'" "-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/component-base/version.${key}=${val}'" ) } diff --git a/pkg/BUILD b/pkg/BUILD index a89c9d13d98..61c34a7bf7f 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -79,7 +79,6 @@ filegroup( "//pkg/serviceaccount:all-srcs", "//pkg/ssh:all-srcs", "//pkg/util:all-srcs", - "//pkg/version:all-srcs", "//pkg/volume:all-srcs", "//pkg/watch/json:all-srcs", "//pkg/windows/service:all-srcs", diff --git a/pkg/credentialprovider/aws/BUILD b/pkg/credentialprovider/aws/BUILD index 8ba6f1e8fe5..f83326497c3 100644 --- a/pkg/credentialprovider/aws/BUILD +++ b/pkg/credentialprovider/aws/BUILD @@ -12,9 +12,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/credentialprovider/aws", deps = [ "//pkg/credentialprovider:go_default_library", - "//pkg/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library", diff --git a/pkg/credentialprovider/aws/aws_credentials.go b/pkg/credentialprovider/aws/aws_credentials.go index a650a7da50b..82a990dc4a1 100644 --- a/pkg/credentialprovider/aws/aws_credentials.go +++ b/pkg/credentialprovider/aws/aws_credentials.go @@ -33,9 +33,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" + "k8s.io/component-base/version" "k8s.io/klog" "k8s.io/kubernetes/pkg/credentialprovider" - "k8s.io/kubernetes/pkg/version" ) var ecrPattern = regexp.MustCompile(`^(\d{12})\.dkr\.ecr(\-fips)?\.([a-zA-Z0-9][a-zA-Z0-9-_]*)\.amazonaws\.com(\.cn)?$`) diff --git a/pkg/kubectl/.import-restrictions b/pkg/kubectl/.import-restrictions index 22a68dc03ac..67002fcc8e5 100644 --- a/pkg/kubectl/.import-restrictions +++ b/pkg/kubectl/.import-restrictions @@ -64,7 +64,6 @@ "k8s.io/kubernetes/pkg/util/interrupt", "k8s.io/kubernetes/pkg/util/node", "k8s.io/kubernetes/pkg/util/parsers", - "k8s.io/kubernetes/pkg/version", "k8s.io/utils/pointer" ], "ForbiddenPrefixes": [] diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 4aa528ec1fd..b8b47c67624 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -213,7 +213,6 @@ go_test( "//pkg/scheduler/nodeinfo:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/taints:go_default_library", - "//pkg/version:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/awsebs:go_default_library", "//pkg/volume/azure_dd:go_default_library", @@ -249,6 +248,7 @@ go_test( "//staging/src/k8s.io/client-go/util/testing:go_default_library", "//staging/src/k8s.io/component-base/featuregate:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index 7732c7b2cab..ba52719cf4f 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -50,6 +50,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/component-base/version" "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" @@ -60,7 +61,6 @@ import ( kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volumemanager" schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" taintutil "k8s.io/kubernetes/pkg/util/taints" - "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/volume/util" ) diff --git a/pkg/kubelet/nodestatus/BUILD b/pkg/kubelet/nodestatus/BUILD index 047b2ab087c..fcf5f4e9c30 100644 --- a/pkg/kubelet/nodestatus/BUILD +++ b/pkg/kubelet/nodestatus/BUILD @@ -13,7 +13,6 @@ go_library( "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/events:go_default_library", - "//pkg/version:go_default_library", "//pkg/volume:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", @@ -22,6 +21,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], @@ -51,7 +51,6 @@ go_test( "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/util/sliceutils:go_default_library", - "//pkg/version:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -63,6 +62,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cloud-provider/fake:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", diff --git a/pkg/kubelet/nodestatus/setters.go b/pkg/kubelet/nodestatus/setters.go index 8ed1cb465b0..8d1be2f94fd 100644 --- a/pkg/kubelet/nodestatus/setters.go +++ b/pkg/kubelet/nodestatus/setters.go @@ -33,6 +33,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" utilfeature "k8s.io/apiserver/pkg/util/feature" cloudprovider "k8s.io/cloud-provider" + "k8s.io/component-base/version" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" - "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/volume" "k8s.io/klog" diff --git a/pkg/kubelet/nodestatus/setters_test.go b/pkg/kubelet/nodestatus/setters_test.go index a92f3c19517..7ed8b8b542c 100644 --- a/pkg/kubelet/nodestatus/setters_test.go +++ b/pkg/kubelet/nodestatus/setters_test.go @@ -36,12 +36,12 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" cloudprovider "k8s.io/cloud-provider" fakecloud "k8s.io/cloud-provider/fake" + "k8s.io/component-base/version" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" - "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 75e7f60eaab..105290c0ec9 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -157,7 +157,6 @@ go_test( "//pkg/registry/certificates/rest:go_default_library", "//pkg/registry/core/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/version:go_default_library", "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/naming:go_default_library", @@ -182,6 +181,7 @@ go_test( "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/go-openapi/loads:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/go-openapi/strfmt:go_default_library", diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 383d62a04e1..1e03306e6bf 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -46,6 +46,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" restclient "k8s.io/client-go/rest" + kubeversion "k8s.io/component-base/version" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/batch" @@ -57,7 +58,6 @@ import ( certificatesrest "k8s.io/kubernetes/pkg/registry/certificates/rest" corerest "k8s.io/kubernetes/pkg/registry/core/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - kubeversion "k8s.io/kubernetes/pkg/version" "github.com/stretchr/testify/assert" ) diff --git a/pkg/probe/http/BUILD b/pkg/probe/http/BUILD index b92ac48587d..3541c2569d7 100644 --- a/pkg/probe/http/BUILD +++ b/pkg/probe/http/BUILD @@ -12,8 +12,8 @@ go_library( importpath = "k8s.io/kubernetes/pkg/probe/http", deps = [ "//pkg/probe:go_default_library", - "//pkg/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/io:go_default_library", ], diff --git a/pkg/probe/http/http.go b/pkg/probe/http/http.go index 0617b829614..84aae213195 100644 --- a/pkg/probe/http/http.go +++ b/pkg/probe/http/http.go @@ -25,8 +25,8 @@ import ( "time" utilnet "k8s.io/apimachinery/pkg/util/net" + "k8s.io/component-base/version" "k8s.io/kubernetes/pkg/probe" - "k8s.io/kubernetes/pkg/version" "k8s.io/klog" utilio "k8s.io/utils/io" diff --git a/pkg/version/.gitattributes b/pkg/version/.gitattributes deleted file mode 100644 index 7e349eff60b..00000000000 --- a/pkg/version/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -base.go export-subst diff --git a/pkg/version/BUILD b/pkg/version/BUILD deleted file mode 100644 index 26b0a161238..00000000000 --- a/pkg/version/BUILD +++ /dev/null @@ -1,34 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "base.go", - "doc.go", - "version.go", - ], - importpath = "k8s.io/kubernetes/pkg/version", - deps = ["//staging/src/k8s.io/apimachinery/pkg/version:go_default_library"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/version/prometheus:all-srcs", - "//pkg/version/verflag:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/version/base.go b/pkg/version/base.go deleted file mode 100644 index 730e79f03d1..00000000000 --- a/pkg/version/base.go +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2014 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package version - -// Base version information. -// -// This is the fallback data used when version information from git is not -// provided via go ldflags. It provides an approximation of the Kubernetes -// version for ad-hoc builds (e.g. `go build`) that cannot get the version -// information from git. -// -// If you are looking at these fields in the git tree, they look -// strange. They are modified on the fly by the build process. The -// in-tree values are dummy values used for "git archive", which also -// works for GitHub tar downloads. -// -// When releasing a new Kubernetes version, this file is updated by -// build/mark_new_version.sh to reflect the new version, and then a -// git annotated tag (using format vX.Y where X == Major version and Y -// == Minor version) is created to point to the commit that updates -// pkg/version/base.go -var ( - // TODO: Deprecate gitMajor and gitMinor, use only gitVersion - // instead. First step in deprecation, keep the fields but make - // them irrelevant. (Next we'll take it out, which may muck with - // scripts consuming the kubectl version output - but most of - // these should be looking at gitVersion already anyways.) - gitMajor string // major version, always numeric - gitMinor string // minor version, numeric possibly followed by "+" - - // semantic version, derived by build scripts (see - // https://github.com/kubernetes/community/blob/master/contributors/design-proposals/release/versioning.md - // for a detailed discussion of this field) - // - // TODO: This field is still called "gitVersion" for legacy - // reasons. For prerelease versions, the build metadata on the - // semantic version is a git hash, but the version itself is no - // longer the direct output of "git describe", but a slight - // translation to be semver compliant. - - // NOTE: The $Format strings are replaced during 'git archive' thanks to the - // companion .gitattributes file containing 'export-subst' in this same - // directory. See also https://git-scm.com/docs/gitattributes - gitVersion = "v0.0.0-master+$Format:%h$" - gitCommit = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD) - gitTreeState = "" // state of git tree, either "clean" or "dirty" - - buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ') -) diff --git a/pkg/version/def.bzl b/pkg/version/def.bzl deleted file mode 100644 index 302893b1b88..00000000000 --- a/pkg/version/def.bzl +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2017 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Implements hack/lib/version.sh's kube::version::ldflags() for Bazel. -def version_x_defs(): - # This should match the list of packages in kube::version::ldflag - stamp_pkgs = [ - "k8s.io/kubernetes/pkg/version", - "k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version", - ] - - # This should match the list of vars in kube::version::ldflags - # It should also match the list of vars set in hack/print-workspace-status.sh. - stamp_vars = [ - "buildDate", - "gitCommit", - "gitMajor", - "gitMinor", - "gitTreeState", - "gitVersion", - ] - - # Generate the cross-product. - x_defs = {} - for pkg in stamp_pkgs: - for var in stamp_vars: - x_defs["%s.%s" % (pkg, var)] = "{%s}" % var - return x_defs diff --git a/pkg/version/doc.go b/pkg/version/doc.go deleted file mode 100644 index a4a1c035fc8..00000000000 --- a/pkg/version/doc.go +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2014 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// +k8s:openapi-gen=true - -// Package version supplies version information collected at build time to -// kubernetes components. -package version // import "k8s.io/kubernetes/pkg/version" diff --git a/pkg/version/prometheus/BUILD b/pkg/version/prometheus/BUILD deleted file mode 100644 index 897d51fe7e9..00000000000 --- a/pkg/version/prometheus/BUILD +++ /dev/null @@ -1,29 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["prometheus.go"], - importpath = "k8s.io/kubernetes/pkg/version/prometheus", - deps = [ - "//pkg/version:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/version/version.go b/pkg/version/version.go deleted file mode 100644 index 8c8350d13b7..00000000000 --- a/pkg/version/version.go +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2014 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package version - -import ( - "fmt" - "runtime" - - apimachineryversion "k8s.io/apimachinery/pkg/version" -) - -// Get returns the overall codebase version. It's for detecting -// what code a binary was built from. -func Get() apimachineryversion.Info { - // These variables typically come from -ldflags settings and in - // their absence fallback to the settings in pkg/version/base.go - return apimachineryversion.Info{ - Major: gitMajor, - Minor: gitMinor, - GitVersion: gitVersion, - GitCommit: gitCommit, - GitTreeState: gitTreeState, - BuildDate: buildDate, - GoVersion: runtime.Version(), - Compiler: runtime.Compiler, - Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), - } -} diff --git a/staging/src/k8s.io/client-go/pkg/version/def.bzl b/staging/src/k8s.io/client-go/pkg/version/def.bzl index 9c018a4ef74..ecc9cd3bb09 100644 --- a/staging/src/k8s.io/client-go/pkg/version/def.bzl +++ b/staging/src/k8s.io/client-go/pkg/version/def.bzl @@ -16,7 +16,7 @@ def version_x_defs(): # This should match the list of packages in kube::version::ldflag stamp_pkgs = [ - "k8s.io/kubernetes/pkg/version", + "k8s.io/component-base/version", # In hack/lib/version.sh, this has a vendor/ prefix. That isn't needed here? "k8s.io/client-go/pkg/version", ] diff --git a/staging/src/k8s.io/component-base/metrics/BUILD b/staging/src/k8s.io/component-base/metrics/BUILD index 55a4e605fe1..b1b78e6b3a3 100644 --- a/staging/src/k8s.io/component-base/metrics/BUILD +++ b/staging/src/k8s.io/component-base/metrics/BUILD @@ -69,6 +69,7 @@ filegroup( "//staging/src/k8s.io/component-base/metrics/legacyregistry:all-srcs", "//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:all-srcs", "//staging/src/k8s.io/component-base/metrics/prometheus/restclient:all-srcs", + "//staging/src/k8s.io/component-base/metrics/prometheus/version:all-srcs", "//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:all-srcs", ], tags = ["automanaged"], diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/version/BUILD b/staging/src/k8s.io/component-base/metrics/prometheus/version/BUILD new file mode 100644 index 00000000000..c1f565914f0 --- /dev/null +++ b/staging/src/k8s.io/component-base/metrics/prometheus/version/BUILD @@ -0,0 +1,28 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["metrics.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/component-base/metrics/prometheus/version", + importpath = "k8s.io/component-base/metrics/prometheus/version", + visibility = ["//visibility:public"], + deps = [ + "//staging/src/k8s.io/component-base/metrics:go_default_library", + "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/version/prometheus/prometheus.go b/staging/src/k8s.io/component-base/metrics/prometheus/version/metrics.go similarity index 56% rename from pkg/version/prometheus/prometheus.go rename to staging/src/k8s.io/component-base/metrics/prometheus/version/metrics.go index 27ccc4a8a1b..408812bab2b 100644 --- a/pkg/version/prometheus/prometheus.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/version/metrics.go @@ -1,5 +1,5 @@ /* -Copyright 2016 The Kubernetes Authors. +Copyright 2019 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,25 +14,28 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package prometheus registers Kubernetes version information as a -// prometheus metric. -package prometheus +package version import ( - "github.com/prometheus/client_golang/prometheus" - "k8s.io/kubernetes/pkg/version" + "k8s.io/component-base/metrics" + "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/component-base/version" ) -func init() { - buildInfo := prometheus.NewGaugeVec( - prometheus.GaugeOpts{ - Name: "kubernetes_build_info", - Help: "A metric with a constant '1' value labeled by major, minor, git version, git commit, git tree state, build date, Go version, and compiler from which Kubernetes was built, and platform on which it is running.", +var ( + buildInfo = metrics.NewGaugeVec( + &metrics.GaugeOpts{ + Name: "kubernetes_build_info", + Help: "A metric with a constant '1' value labeled by major, minor, git version, git commit, git tree state, build date, Go version, and compiler from which Kubernetes was built, and platform on which it is running.", + StabilityLevel: metrics.ALPHA, }, []string{"major", "minor", "gitVersion", "gitCommit", "gitTreeState", "buildDate", "goVersion", "compiler", "platform"}, ) - info := version.Get() - buildInfo.WithLabelValues(info.Major, info.Minor, info.GitVersion, info.GitCommit, info.GitTreeState, info.BuildDate, info.GoVersion, info.Compiler, info.Platform).Set(1) +) - prometheus.MustRegister(buildInfo) +// RegisterBuildInfo registers the build and version info in a metadata metric in prometheus +func init() { + info := version.Get() + legacyregistry.MustRegister(buildInfo) + buildInfo.WithLabelValues(info.Major, info.Minor, info.GitVersion, info.GitCommit, info.GitTreeState, info.BuildDate, info.GoVersion, info.Compiler, info.Platform).Set(1) } diff --git a/staging/src/k8s.io/component-base/metrics/registry.go b/staging/src/k8s.io/component-base/metrics/registry.go index 701f151999b..c8aeb34c8d8 100644 --- a/staging/src/k8s.io/component-base/metrics/registry.go +++ b/staging/src/k8s.io/component-base/metrics/registry.go @@ -148,14 +148,9 @@ func newKubeRegistry(v apimachineryversion.Info) *kubeRegistry { return r } -func registerMetadataMetrics(r *kubeRegistry) { - RegisterBuildInfo(r) -} - // NewKubeRegistry creates a new vanilla Registry without any Collectors // pre-registered. func NewKubeRegistry() KubeRegistry { r := newKubeRegistry(version.Get()) - registerMetadataMetrics(r) return r } diff --git a/staging/src/k8s.io/component-base/version/BUILD b/staging/src/k8s.io/component-base/version/BUILD index c9aba34313a..a8a3fc75cd5 100644 --- a/staging/src/k8s.io/component-base/version/BUILD +++ b/staging/src/k8s.io/component-base/version/BUILD @@ -21,7 +21,10 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//staging/src/k8s.io/component-base/version/verflag:all-srcs", + ], tags = ["automanaged"], visibility = ["//visibility:public"], ) diff --git a/staging/src/k8s.io/component-base/version/base.go b/staging/src/k8s.io/component-base/version/base.go index c84c6d2d1c5..e13678c305f 100644 --- a/staging/src/k8s.io/component-base/version/base.go +++ b/staging/src/k8s.io/component-base/version/base.go @@ -32,7 +32,7 @@ package version // build/mark_new_version.sh to reflect the new version, and then a // git annotated tag (using format vX.Y where X == Major version and Y // == Minor version) is created to point to the commit that updates -// pkg/version/base.go +// component-base/version/base.go var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion // instead. First step in deprecation, keep the fields but make diff --git a/staging/src/k8s.io/component-base/version/def.bzl b/staging/src/k8s.io/component-base/version/def.bzl index ac7571b28f1..77edcbc89bc 100644 --- a/staging/src/k8s.io/component-base/version/def.bzl +++ b/staging/src/k8s.io/component-base/version/def.bzl @@ -16,8 +16,8 @@ def version_x_defs(): # This should match the list of packages in kube::version::ldflag stamp_pkgs = [ - "k8s.io/kubernetes/pkg/version", "k8s.io/kubernetes/vendor/k8s.io/component-base/version", + "k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version", ] # This should match the list of vars in kube::version::ldflags diff --git a/pkg/version/verflag/BUILD b/staging/src/k8s.io/component-base/version/verflag/BUILD similarity index 63% rename from pkg/version/verflag/BUILD rename to staging/src/k8s.io/component-base/version/verflag/BUILD index 5d725336ec2..ca3c2b0f5ff 100644 --- a/pkg/version/verflag/BUILD +++ b/staging/src/k8s.io/component-base/version/verflag/BUILD @@ -4,13 +4,15 @@ load( "@io_bazel_rules_go//go:def.bzl", "go_library", ) +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") go_library( name = "go_default_library", srcs = ["verflag.go"], - importpath = "k8s.io/kubernetes/pkg/version/verflag", + importmap = "k8s.io/kubernetes/vendor/k8s.io/component-base/version/verflag", + importpath = "k8s.io/component-base/version/verflag", deps = [ - "//pkg/version:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], ) diff --git a/pkg/version/verflag/verflag.go b/staging/src/k8s.io/component-base/version/verflag/verflag.go similarity index 98% rename from pkg/version/verflag/verflag.go rename to staging/src/k8s.io/component-base/version/verflag/verflag.go index 18c3ac44247..f27e101caa0 100644 --- a/pkg/version/verflag/verflag.go +++ b/staging/src/k8s.io/component-base/version/verflag/verflag.go @@ -25,7 +25,7 @@ import ( flag "github.com/spf13/pflag" - "k8s.io/kubernetes/pkg/version" + "k8s.io/component-base/version" ) type versionValue int diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index d93dd8a31f6..0378f1977d1 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -25,7 +25,6 @@ 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", "//staging/src/k8s.io/kubectl/test/data:all-srcs", ], tags = ["automanaged"], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/util/BUILD index 670b58055f2..20c30665a2e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/BUILD @@ -32,12 +32,12 @@ go_library( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi/validation: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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/kubectl_match_version.go b/staging/src/k8s.io/kubectl/pkg/cmd/util/kubectl_match_version.go index 0c3f6e04917..74308bc5d86 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/kubectl_match_version.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/kubectl_match_version.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubectl/pkg/version" + "k8s.io/component-base/version" ) const ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD index f2acee5a66a..7bbb72c6013 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD @@ -11,10 +11,10 @@ go_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/component-base/version:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util: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", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/version/version.go b/staging/src/k8s.io/kubectl/pkg/cmd/version/version.go index a5659bc61de..c39f368d9c6 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/version/version.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/version/version.go @@ -28,10 +28,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/discovery" "k8s.io/client-go/tools/clientcmd" + "k8s.io/component-base/version" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/version" ) // Version is a struct for version information diff --git a/staging/src/k8s.io/kubectl/pkg/version/BUILD b/staging/src/k8s.io/kubectl/pkg/version/BUILD deleted file mode 100644 index 04ea16bc1cb..00000000000 --- a/staging/src/k8s.io/kubectl/pkg/version/BUILD +++ /dev/null @@ -1,27 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "base.go", - "version.go", - ], - 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"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/staging/src/k8s.io/kubectl/pkg/version/base.go b/staging/src/k8s.io/kubectl/pkg/version/base.go deleted file mode 100644 index c84c6d2d1c5..00000000000 --- a/staging/src/k8s.io/kubectl/pkg/version/base.go +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2019 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package version - -// Base version information. -// -// This is the fallback data used when version information from git is not -// provided via go ldflags. It provides an approximation of the Kubernetes -// version for ad-hoc builds (e.g. `go build`) that cannot get the version -// information from git. -// -// If you are looking at these fields in the git tree, they look -// strange. They are modified on the fly by the build process. The -// in-tree values are dummy values used for "git archive", which also -// works for GitHub tar downloads. -// -// When releasing a new Kubernetes version, this file is updated by -// build/mark_new_version.sh to reflect the new version, and then a -// git annotated tag (using format vX.Y where X == Major version and Y -// == Minor version) is created to point to the commit that updates -// pkg/version/base.go -var ( - // TODO: Deprecate gitMajor and gitMinor, use only gitVersion - // instead. First step in deprecation, keep the fields but make - // them irrelevant. (Next we'll take it out, which may muck with - // scripts consuming the kubectl version output - but most of - // these should be looking at gitVersion already anyways.) - gitMajor string // major version, always numeric - gitMinor string // minor version, numeric possibly followed by "+" - - // semantic version, derived by build scripts (see - // https://github.com/kubernetes/community/blob/master/contributors/design-proposals/release/versioning.md - // for a detailed discussion of this field) - // - // TODO: This field is still called "gitVersion" for legacy - // reasons. For prerelease versions, the build metadata on the - // semantic version is a git hash, but the version itself is no - // longer the direct output of "git describe", but a slight - // translation to be semver compliant. - - // NOTE: The $Format strings are replaced during 'git archive' thanks to the - // companion .gitattributes file containing 'export-subst' in this same - // directory. See also https://git-scm.com/docs/gitattributes - gitVersion = "v0.0.0-master+$Format:%h$" - gitCommit = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD) - gitTreeState = "" // state of git tree, either "clean" or "dirty" - - buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ') -) diff --git a/staging/src/k8s.io/kubectl/pkg/version/def.bzl b/staging/src/k8s.io/kubectl/pkg/version/def.bzl deleted file mode 100644 index 8ca2ca79233..00000000000 --- a/staging/src/k8s.io/kubectl/pkg/version/def.bzl +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2017 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Implements hack/lib/version.sh's kube::version::ldflags() for Bazel. -# Modifies the version variables (stamp_vars:buildDate, gitCommit, ...) -# Example go build command with ldflags: -# go install ... -ldflags -X 'k8s.io/kubernetes/pkg/kubectl/cmd/version.gitMinor=12+' ... -def version_x_defs(): - stamp_pkgs = [ - "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/version", - ] - - # This should match the list of vars in kube::version::ldflags - # It should also match the list of vars set in hack/print-workspace-status.sh. - stamp_vars = [ - "buildDate", - "gitCommit", - "gitMajor", - "gitMinor", - "gitTreeState", - "gitVersion", - ] - - # Generate the cross-product. - x_defs = {} - for pkg in stamp_pkgs: - for var in stamp_vars: - x_defs["%s.%s" % (pkg, var)] = "{%s}" % var - return x_defs diff --git a/staging/src/k8s.io/kubectl/pkg/version/version.go b/staging/src/k8s.io/kubectl/pkg/version/version.go deleted file mode 100644 index d1e76dc00e0..00000000000 --- a/staging/src/k8s.io/kubectl/pkg/version/version.go +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2019 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package version - -import ( - "fmt" - "runtime" - - apimachineryversion "k8s.io/apimachinery/pkg/version" -) - -// Get returns the overall codebase version. It's for detecting -// what code a binary was built from. -func Get() apimachineryversion.Info { - // These variables typically come from -ldflags settings and in - // their absence fallback to the settings in ./base.go - return apimachineryversion.Info{ - Major: gitMajor, - Minor: gitMinor, - GitVersion: gitVersion, - GitCommit: gitCommit, - GitTreeState: gitTreeState, - BuildDate: buildDate, - GoVersion: runtime.Version(), - Compiler: runtime.Compiler, - Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), - } -} diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 76535a44eb6..40e784d81ae 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -39,7 +39,6 @@ go_library( "//pkg/kubelet/sysctl:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/util/taints:go_default_library", - "//pkg/version:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -80,6 +79,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//test/e2e/framework/ginkgowrapper:go_default_library", "//test/e2e/framework/kubelet:go_default_library", "//test/e2e/framework/log:go_default_library", diff --git a/test/e2e/framework/suites.go b/test/e2e/framework/suites.go index 22b11d1b399..e3ed593b435 100644 --- a/test/e2e/framework/suites.go +++ b/test/e2e/framework/suites.go @@ -26,7 +26,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/version" + "k8s.io/component-base/version" e2elog "k8s.io/kubernetes/test/e2e/framework/log" e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" diff --git a/test/integration/client/BUILD b/test/integration/client/BUILD index a6232b87058..66073bb551f 100644 --- a/test/integration/client/BUILD +++ b/test/integration/client/BUILD @@ -19,7 +19,6 @@ go_test( "//cmd/kube-apiserver/app/testing:go_default_library", "//pkg/api/legacyscheme:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/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/apis/meta/v1:go_default_library", @@ -33,6 +32,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//test/integration/framework:go_default_library", "//test/utils/image:go_default_library", ], diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 57031679bb7..cb60d4bdae4 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -37,9 +37,9 @@ import ( "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" + "k8s.io/component-base/version" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" - "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/test/integration/framework" imageutils "k8s.io/kubernetes/test/utils/image" ) diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index d34a48b5a2b..999a2d7708d 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -43,7 +43,6 @@ go_library( "//pkg/kubelet/client:go_default_library", "//pkg/master:go_default_library", "//pkg/util/env:go_default_library", - "//pkg/version:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -67,6 +66,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/util/cert:go_default_library", + "//staging/src/k8s.io/component-base/version:go_default_library", "//test/e2e/framework:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/coreos/etcd/clientv3:go_default_library", diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index efaf7e524a4..3a38f64f629 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -44,6 +44,7 @@ import ( "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + "k8s.io/component-base/version" "k8s.io/klog" openapicommon "k8s.io/kube-openapi/pkg/common" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -51,7 +52,6 @@ import ( "k8s.io/kubernetes/pkg/kubeapiserver" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master" - "k8s.io/kubernetes/pkg/version" ) // Config is a struct of configuration directives for NewMasterComponents. diff --git a/vendor/modules.txt b/vendor/modules.txt index 578a4d3f0cb..28c3a946267 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1669,8 +1669,10 @@ k8s.io/component-base/metrics/legacyregistry k8s.io/component-base/metrics/prometheus/clientgo k8s.io/component-base/metrics/prometheus/clientgo/leaderelection k8s.io/component-base/metrics/prometheus/restclient +k8s.io/component-base/metrics/prometheus/version k8s.io/component-base/metrics/prometheus/workqueue k8s.io/component-base/version +k8s.io/component-base/version/verflag # k8s.io/cri-api v0.0.0 => ./staging/src/k8s.io/cri-api k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1alpha2 @@ -1823,7 +1825,6 @@ 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