github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

remove pkg/version and some of redundant copies of it

Browse Source 
Change-Id: Ia58367c1b1274bfb49c8a4784051463abaf795de
This commit is contained in:
Han Kang
2019-09-10 14:42:55 -07:00
parent 1bebaea417
commit 866ea74326
95 changed files with 141 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/cloud-controller-manager/BUILD
View File

@@ -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",
],
)

2
cmd/cloud-controller-manager/app/BUILD
View File

@@ -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",

2
cmd/cloud-controller-manager/app/controllermanager.go
View File

@@ -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 (

1
cmd/cloud-controller-manager/controller-manager.go
View File

@@ -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