Skip to content

Commit 67d928a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#82096 from logicalhan/version-deletion
remove pkg/version and some of redundant copies of it
2 parents 28ed0db + 866ea74 commit 67d928a

File tree

95 files changed

+140
-682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+140
-682
lines changed

‎build/kazel_generated.bzl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ tags_values_pkgs = {"openapi-gen": {
3939
"pkg/apis/abac/v0",
4040
"pkg/apis/abac/v1beta1",
4141
"pkg/apis/auditregistration",
42-
"pkg/version",
4342
"staging/src/k8s.io/api/admissionregistration/v1",
4443
"staging/src/k8s.io/api/admissionregistration/v1beta1",
4544
"staging/src/k8s.io/api/apps/v1",
@@ -116,7 +115,6 @@ tags_pkgs_values = {"openapi-gen": {
116115
"pkg/apis/abac/v0": ["true"],
117116
"pkg/apis/abac/v1beta1": ["true"],
118117
"pkg/apis/auditregistration": ["true"],
119-
"pkg/version": ["true"],
120118
"staging/src/k8s.io/api/admission/v1": ["false"],
121119
"staging/src/k8s.io/api/admission/v1beta1": ["false"],
122120
"staging/src/k8s.io/api/admissionregistration/v1": ["true"],

‎cmd/cloud-controller-manager/BUILD‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load(
55
"go_binary",
66
"go_library",
77
)
8-
load("//pkg/version:def.bzl", "version_x_defs")
8+
load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs")
99

1010
go_binary(
1111
name = "cloud-controller-manager",
@@ -23,6 +23,7 @@ go_library(
2323
"//pkg/cloudprovider/providers:go_default_library",
2424
"//staging/src/k8s.io/component-base/logs:go_default_library",
2525
"//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library",
26+
"//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library",
2627
],
2728
)
2829

‎cmd/cloud-controller-manager/app/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ go_library(
1818
"//pkg/features:go_default_library",
1919
"//pkg/util/configz:go_default_library",
2020
"//pkg/util/flag:go_default_library",
21-
"//pkg/version/verflag:go_default_library",
2221
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
2322
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
2423
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
@@ -32,6 +31,7 @@ go_library(
3231
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
3332
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
3433
"//staging/src/k8s.io/component-base/version:go_default_library",
34+
"//staging/src/k8s.io/component-base/version/verflag:go_default_library",
3535
"//vendor/github.com/spf13/cobra:go_default_library",
3636
"//vendor/k8s.io/klog:go_default_library",
3737
"//vendor/k8s.io/utils/net:go_default_library",

‎cmd/cloud-controller-manager/app/controllermanager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ import (
3838
cliflag "k8s.io/component-base/cli/flag"
3939
"k8s.io/component-base/cli/globalflag"
4040
"k8s.io/component-base/version"
41+
"k8s.io/component-base/version/verflag"
4142
"k8s.io/klog"
4243
cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
4344
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
4445
genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
4546
"k8s.io/kubernetes/pkg/util/configz"
4647
utilflag "k8s.io/kubernetes/pkg/util/flag"
47-
"k8s.io/kubernetes/pkg/version/verflag"
4848
)
4949

5050
const (

‎cmd/cloud-controller-manager/controller-manager.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"k8s.io/component-base/logs"
2828
"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
2929

30+
_ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
3031
// NOTE: Importing all in-tree cloud-providers is not required when
3132
// implementing an out-of-tree cloud-provider.
3233
_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins

‎cmd/hyperkube/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load(
55
go_binary = "go_binary_conditional_pure",
66
)
77
load("@io_bazel_rules_go//go:def.bzl", "go_library")
8-
load("//pkg/version:def.bzl", "version_x_defs")
8+
load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs")
99

1010
go_binary(
1111
name = "hyperkube",
@@ -25,10 +25,10 @@ go_library(
2525
"//cmd/kube-scheduler/app:go_default_library",
2626
"//cmd/kubelet/app:go_default_library",
2727
"//pkg/kubectl/cmd:go_default_library",
28-
"//pkg/version/prometheus:go_default_library",
2928
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
3029
"//staging/src/k8s.io/component-base/logs:go_default_library",
3130
"//staging/src/k8s.io/component-base/metrics/prometheus/restclient:go_default_library",
31+
"//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library",
3232
"//vendor/github.com/spf13/cobra:go_default_library",
3333
"//vendor/github.com/spf13/pflag:go_default_library",
3434
],

‎cmd/hyperkube/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ import (
3232
cliflag "k8s.io/component-base/cli/flag"
3333
"k8s.io/component-base/logs"
3434
_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
35+
_ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
3536
cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
3637
kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
3738
kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app"
3839
kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app"
3940
kubescheduler "k8s.io/kubernetes/cmd/kube-scheduler/app"
4041
kubelet "k8s.io/kubernetes/cmd/kubelet/app"
4142
kubectl "k8s.io/kubernetes/pkg/kubectl/cmd"
42-
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
4343
)
4444

4545
func main() {

‎cmd/kube-apiserver/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load(
55
"go_binary",
66
"go_library",
77
)
8-
load("//pkg/version:def.bzl", "version_x_defs")
8+
load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs")
99

1010
go_binary(
1111
name = "kube-apiserver",

‎cmd/kube-apiserver/app/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ go_library(
3030
"//pkg/registry/rbac/rest:go_default_library",
3131
"//pkg/serviceaccount:go_default_library",
3232
"//pkg/util/flag:go_default_library",
33-
"//pkg/version/verflag:go_default_library",
3433
"//plugin/pkg/auth/authenticator/token/bootstrap:go_default_library",
3534
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1:go_default_library",
3635
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
@@ -67,6 +66,7 @@ go_library(
6766
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
6867
"//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:go_default_library",
6968
"//staging/src/k8s.io/component-base/version:go_default_library",
69+
"//staging/src/k8s.io/component-base/version/verflag:go_default_library",
7070
"//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1:go_default_library",
7171
"//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper:go_default_library",
7272
"//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",

‎cmd/kube-apiserver/app/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import (
6060
"k8s.io/component-base/cli/globalflag"
6161
_ "k8s.io/component-base/metrics/prometheus/workqueue" // for workqueue metric registration
6262
"k8s.io/component-base/version"
63+
"k8s.io/component-base/version/verflag"
6364
"k8s.io/klog"
6465
aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
6566
aggregatorscheme "k8s.io/kube-aggregator/pkg/apiserver/scheme"
@@ -82,7 +83,6 @@ import (
8283
rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
8384
"k8s.io/kubernetes/pkg/serviceaccount"
8485
utilflag "k8s.io/kubernetes/pkg/util/flag"
85-
"k8s.io/kubernetes/pkg/version/verflag"
8686
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/bootstrap"
8787
)
8888

0 commit comments

Comments
 (0)