Skip to content

Commit a86afc1

Browse files
lavalamplavalamp
committed
update scripts
1 parent 7bf2ada commit a86afc1

File tree

36 files changed

+56
-56
lines changed

36 files changed

+56
-56
lines changed

‎cmd/kube-apiserver/app/BUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ go_library(
1313
"//cmd/kube-apiserver/app/options:go_default_library",
1414
"//pkg/api/legacyscheme:go_default_library",
1515
"//pkg/capabilities:go_default_library",
16+
"//pkg/controlplane:go_default_library",
17+
"//pkg/controlplane/controller/crdregistration:go_default_library",
18+
"//pkg/controlplane/reconcilers:go_default_library",
19+
"//pkg/controlplane/tunneler:go_default_library",
1620
"//pkg/features:go_default_library",
1721
"//pkg/generated/openapi:go_default_library",
1822
"//pkg/kubeapiserver:go_default_library",
@@ -21,10 +25,6 @@ go_library(
2125
"//pkg/kubeapiserver/authorizer/modes:go_default_library",
2226
"//pkg/kubeapiserver/options:go_default_library",
2327
"//pkg/kubeapiserver/server:go_default_library",
24-
"//pkg/master:go_default_library",
25-
"//pkg/master/controller/crdregistration:go_default_library",
26-
"//pkg/master/reconcilers:go_default_library",
27-
"//pkg/master/tunneler:go_default_library",
2828
"//pkg/registry/rbac/rest:go_default_library",
2929
"//pkg/serviceaccount:go_default_library",
3030
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1:go_default_library",

‎cmd/kube-apiserver/app/options/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ go_library(
2020
"//pkg/apis/core:go_default_library",
2121
"//pkg/cloudprovider/providers:go_default_library",
2222
"//pkg/cluster/ports:go_default_library",
23+
"//pkg/controlplane/reconcilers:go_default_library",
2324
"//pkg/features:go_default_library",
2425
"//pkg/kubeapiserver/options:go_default_library",
2526
"//pkg/kubelet/client:go_default_library",
26-
"//pkg/master/reconcilers:go_default_library",
2727
"//pkg/serviceaccount:go_default_library",
2828
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library",
2929
"//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library",
@@ -52,10 +52,10 @@ go_test(
5252
embed = [":go_default_library"],
5353
deps = [
5454
"//pkg/apis/core:go_default_library",
55+
"//pkg/controlplane/reconcilers:go_default_library",
5556
"//pkg/features:go_default_library",
5657
"//pkg/kubeapiserver/options:go_default_library",
5758
"//pkg/kubelet/client:go_default_library",
58-
"//pkg/master/reconcilers:go_default_library",
5959
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
6060
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
6161
"//staging/src/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
"k8s.io/component-base/logs"
3030
"k8s.io/component-base/metrics"
3131
api "k8s.io/kubernetes/pkg/apis/core"
32+
"k8s.io/kubernetes/pkg/cluster/ports"
33+
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
3234
_ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
3335
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
3436
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
35-
"k8s.io/kubernetes/pkg/cluster/ports"
36-
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
3737
"k8s.io/kubernetes/pkg/serviceaccount"
3838
)
3939

‎cmd/kube-apiserver/app/options/options_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import (
3636
cliflag "k8s.io/component-base/cli/flag"
3737
"k8s.io/component-base/metrics"
3838
kapi "k8s.io/kubernetes/pkg/apis/core"
39+
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
3940
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
4041
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
41-
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
4242
)
4343

4444
func TestAddFlags(t *testing.T) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ import (
6868
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
6969
"k8s.io/kubernetes/pkg/api/legacyscheme"
7070
"k8s.io/kubernetes/pkg/capabilities"
71+
"k8s.io/kubernetes/pkg/controlplane"
72+
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
73+
"k8s.io/kubernetes/pkg/controlplane/tunneler"
7174
"k8s.io/kubernetes/pkg/features"
7275
generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi"
7376
"k8s.io/kubernetes/pkg/kubeapiserver"
@@ -76,9 +79,6 @@ import (
7679
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
7780
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
7881
kubeserver "k8s.io/kubernetes/pkg/kubeapiserver/server"
79-
"k8s.io/kubernetes/pkg/controlplane"
80-
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
81-
"k8s.io/kubernetes/pkg/controlplane/tunneler"
8282
rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
8383
"k8s.io/kubernetes/pkg/serviceaccount"
8484
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ import (
3838
kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1"
3939
cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
4040
kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config"
41+
"k8s.io/kubernetes/pkg/cluster/ports"
4142
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
4243
kubectrlmgrconfigscheme "k8s.io/kubernetes/pkg/controller/apis/config/scheme"
4344
"k8s.io/kubernetes/pkg/controller/garbagecollector"
4445
garbagecollectorconfig "k8s.io/kubernetes/pkg/controller/garbagecollector/config"
45-
"k8s.io/kubernetes/pkg/cluster/ports"
4646

4747
// add the kubernetes feature gates
4848
_ "k8s.io/kubernetes/pkg/features"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ import (
6262
"k8s.io/klog/v2"
6363
"k8s.io/kube-proxy/config/v1alpha1"
6464
api "k8s.io/kubernetes/pkg/apis/core"
65+
"k8s.io/kubernetes/pkg/cluster/ports"
6566
"k8s.io/kubernetes/pkg/features"
6667
"k8s.io/kubernetes/pkg/kubelet/qos"
67-
"k8s.io/kubernetes/pkg/cluster/ports"
6868
"k8s.io/kubernetes/pkg/proxy"
6969
"k8s.io/kubernetes/pkg/proxy/apis"
7070
kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"

‎cmd/kubelet/app/options/options.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ import (
3232
cliflag "k8s.io/component-base/cli/flag"
3333
"k8s.io/kubelet/config/v1beta1"
3434
"k8s.io/kubernetes/pkg/apis/core"
35+
"k8s.io/kubernetes/pkg/cluster/ports"
3536
"k8s.io/kubernetes/pkg/features"
3637
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
3738
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
3839
kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme"
3940
kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/config/validation"
4041
"k8s.io/kubernetes/pkg/kubelet/config"
41-
"k8s.io/kubernetes/pkg/cluster/ports"
4242
utilflag "k8s.io/kubernetes/pkg/util/flag"
4343
utiltaints "k8s.io/kubernetes/pkg/util/taints"
4444
)

‎cmd/kubemark/hollow-node.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ import (
4141
"k8s.io/component-base/version"
4242
"k8s.io/component-base/version/verflag"
4343
"k8s.io/kubernetes/pkg/api/legacyscheme"
44+
"k8s.io/kubernetes/pkg/cluster/ports"
4445
cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
4546
"k8s.io/kubernetes/pkg/kubelet/cm"
4647
"k8s.io/kubernetes/pkg/kubelet/cri/remote"
4748
fakeremote "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake"
4849
"k8s.io/kubernetes/pkg/kubemark"
49-
"k8s.io/kubernetes/pkg/cluster/ports"
5050
fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing"
5151
fakesysctl "k8s.io/kubernetes/pkg/util/sysctl/testing"
5252
fakeexec "k8s.io/utils/exec/testing"

‎pkg/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ filegroup(
5656
"//pkg/cloudprovider:all-srcs",
5757
"//pkg/cluster/ports:all-srcs",
5858
"//pkg/controller:all-srcs",
59+
"//pkg/controlplane:all-srcs",
5960
"//pkg/credentialprovider:all-srcs",
6061
"//pkg/features:all-srcs",
6162
"//pkg/fieldpath:all-srcs",
@@ -64,7 +65,6 @@ filegroup(
6465
"//pkg/kubectl:all-srcs",
6566
"//pkg/kubelet:all-srcs",
6667
"//pkg/kubemark:all-srcs",
67-
"//pkg/master:all-srcs",
6868
"//pkg/printers:all-srcs",
6969
"//pkg/probe:all-srcs",
7070
"//pkg/proxy:all-srcs",

0 commit comments

Comments
 (0)