Skip to content

Commit 7f4d191

Browse files
cici37cici37
committed
Move pkg/util/configz to k8s.io/component-base
1 parent a26c34e commit 7f4d191

File tree

25 files changed

+24
-22
lines changed

25 files changed

+24
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ go_library(
1515
"//pkg/controller/cloud:go_default_library",
1616
"//pkg/controller/route:go_default_library",
1717
"//pkg/controller/service:go_default_library",
18-
"//pkg/util/configz:go_default_library",
1918
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
2019
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
2120
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
@@ -27,6 +26,7 @@ go_library(
2726
"//staging/src/k8s.io/cloud-provider:go_default_library",
2827
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
2928
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
29+
"//staging/src/k8s.io/component-base/configz:go_default_library",
3030
"//staging/src/k8s.io/component-base/term:go_default_library",
3131
"//staging/src/k8s.io/component-base/version:go_default_library",
3232
"//staging/src/k8s.io/component-base/version/verflag:go_default_library",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ import (
3636
cloudprovider "k8s.io/cloud-provider"
3737
cliflag "k8s.io/component-base/cli/flag"
3838
"k8s.io/component-base/cli/globalflag"
39+
"k8s.io/component-base/configz"
3940
"k8s.io/component-base/term"
4041
"k8s.io/component-base/version"
4142
"k8s.io/component-base/version/verflag"
4243
"k8s.io/klog"
4344
cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
4445
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
4546
genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
46-
"k8s.io/kubernetes/pkg/util/configz"
4747
)
4848

4949
const (

‎cmd/controller-manager/app/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ go_library(
1010
visibility = ["//visibility:public"],
1111
deps = [
1212
"//pkg/api/legacyscheme:go_default_library",
13-
"//pkg/util/configz:go_default_library",
1413
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
1514
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
1615
"//staging/src/k8s.io/apiserver/pkg/endpoints/filters:go_default_library",
@@ -22,6 +21,7 @@ go_library(
2221
"//staging/src/k8s.io/apiserver/pkg/server/routes:go_default_library",
2322
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
2423
"//staging/src/k8s.io/component-base/config:go_default_library",
24+
"//staging/src/k8s.io/component-base/configz:go_default_library",
2525
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
2626
"//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:go_default_library",
2727
"//vendor/k8s.io/klog:go_default_library",

‎cmd/controller-manager/app/serve.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import (
2828
"k8s.io/apiserver/pkg/server/mux"
2929
"k8s.io/apiserver/pkg/server/routes"
3030
componentbaseconfig "k8s.io/component-base/config"
31+
"k8s.io/component-base/configz"
3132
"k8s.io/component-base/metrics/legacyregistry"
3233
_ "k8s.io/component-base/metrics/prometheus/workqueue" // for workqueue metric registration
3334
"k8s.io/kubernetes/pkg/api/legacyscheme"
34-
"k8s.io/kubernetes/pkg/util/configz"
3535
)
3636

3737
// BuildHandlerChain builds a handler chain with a base handler and CompletedConfig.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ go_library(
8585
"//pkg/quota/v1/generic:go_default_library",
8686
"//pkg/quota/v1/install:go_default_library",
8787
"//pkg/serviceaccount:go_default_library",
88-
"//pkg/util/configz:go_default_library",
8988
"//pkg/volume:go_default_library",
9089
"//pkg/volume/awsebs:go_default_library",
9190
"//pkg/volume/azure_dd:go_default_library",
@@ -139,6 +138,7 @@ go_library(
139138
"//staging/src/k8s.io/cloud-provider:go_default_library",
140139
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
141140
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
141+
"//staging/src/k8s.io/component-base/configz:go_default_library",
142142
"//staging/src/k8s.io/component-base/featuregate:go_default_library",
143143
"//staging/src/k8s.io/component-base/metrics/prometheus/ratelimiter:go_default_library",
144144
"//staging/src/k8s.io/component-base/term:go_default_library",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import (
5555
cloudprovider "k8s.io/cloud-provider"
5656
cliflag "k8s.io/component-base/cli/flag"
5757
"k8s.io/component-base/cli/globalflag"
58+
"k8s.io/component-base/configz"
5859
"k8s.io/component-base/term"
5960
"k8s.io/component-base/version"
6061
"k8s.io/component-base/version/verflag"
@@ -67,7 +68,6 @@ import (
6768
serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
6869
"k8s.io/kubernetes/pkg/features"
6970
"k8s.io/kubernetes/pkg/serviceaccount"
70-
"k8s.io/kubernetes/pkg/util/configz"
7171
)
7272

7373
const (

‎cmd/kube-proxy/app/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ go_library(
3434
"//pkg/proxy/ipvs:go_default_library",
3535
"//pkg/proxy/userspace:go_default_library",
3636
"//pkg/proxy/util:go_default_library",
37-
"//pkg/util/configz:go_default_library",
3837
"//pkg/util/filesystem:go_default_library",
3938
"//pkg/util/flag:go_default_library",
4039
"//pkg/util/ipset:go_default_library",
@@ -64,6 +63,7 @@ go_library(
6463
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
6564
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
6665
"//staging/src/k8s.io/component-base/config:go_default_library",
66+
"//staging/src/k8s.io/component-base/configz:go_default_library",
6767
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
6868
"//staging/src/k8s.io/component-base/version:go_default_library",
6969
"//staging/src/k8s.io/component-base/version/verflag:go_default_library",
@@ -232,9 +232,9 @@ go_test(
232232
embed = [":go_default_library"],
233233
deps = [
234234
"//pkg/proxy/apis/config:go_default_library",
235-
"//pkg/util/configz:go_default_library",
236235
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
237236
"//staging/src/k8s.io/component-base/config:go_default_library",
237+
"//staging/src/k8s.io/component-base/configz:go_default_library",
238238
"//vendor/github.com/google/go-cmp/cmp:go_default_library",
239239
"//vendor/github.com/stretchr/testify/assert:go_default_library",
240240
"//vendor/k8s.io/utils/pointer:go_default_library",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import (
5555
"k8s.io/client-go/tools/record"
5656
cliflag "k8s.io/component-base/cli/flag"
5757
componentbaseconfig "k8s.io/component-base/config"
58+
"k8s.io/component-base/configz"
5859
"k8s.io/component-base/metrics/legacyregistry"
5960
"k8s.io/component-base/version"
6061
"k8s.io/component-base/version/verflag"
@@ -76,7 +77,6 @@ import (
7677
"k8s.io/kubernetes/pkg/proxy/ipvs"
7778
"k8s.io/kubernetes/pkg/proxy/userspace"
7879
proxyutil "k8s.io/kubernetes/pkg/proxy/util"
79-
"k8s.io/kubernetes/pkg/util/configz"
8080
"k8s.io/kubernetes/pkg/util/filesystem"
8181
utilflag "k8s.io/kubernetes/pkg/util/flag"
8282
utilipset "k8s.io/kubernetes/pkg/util/ipset"

‎cmd/kube-proxy/app/server_others.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
clientset "k8s.io/client-go/kubernetes"
4545
"k8s.io/client-go/tools/record"
4646
toolswatch "k8s.io/client-go/tools/watch"
47+
"k8s.io/component-base/configz"
4748
"k8s.io/component-base/metrics"
4849
"k8s.io/kubernetes/pkg/features"
4950
"k8s.io/kubernetes/pkg/proxy"
@@ -55,7 +56,6 @@ import (
5556
proxymetrics "k8s.io/kubernetes/pkg/proxy/metrics"
5657
"k8s.io/kubernetes/pkg/proxy/userspace"
5758
proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables"
58-
"k8s.io/kubernetes/pkg/util/configz"
5959
utilipset "k8s.io/kubernetes/pkg/util/ipset"
6060
utiliptables "k8s.io/kubernetes/pkg/util/iptables"
6161
utilipvs "k8s.io/kubernetes/pkg/util/ipvs"

‎cmd/kube-proxy/app/server_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import (
3636

3737
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3838
componentbaseconfig "k8s.io/component-base/config"
39+
"k8s.io/component-base/configz"
3940
kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"
40-
"k8s.io/kubernetes/pkg/util/configz"
4141
)
4242

4343
// This test verifies that NewProxyServer does not crash when CleanupAndExit is true.

0 commit comments

Comments
 (0)