Skip to content

Commit 609e3e3

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#39619 from deads2k/fed-20-rename
Automatic merge from submit-queue (batch tested with PRs 34488, 39511, 39619, 38342, 39491) rename kubernetes-discovery to kube-aggregator Rename `kubernetes-discovery` to `kube-aggregator`. Move and bulk rename. @kubernetes/sig-api-machinery-misc
2 parents 7d2f798 + 453651c commit 609e3e3

File tree

124 files changed

+349
-349
lines changed

Some content is hidden

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

124 files changed

+349
-349
lines changed

build/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ docker_build(
4646
"kube-apiserver",
4747
"kube-controller-manager",
4848
"kube-scheduler",
49-
"kubernetes-discovery",
49+
"kube-aggregator",
5050
]]
5151

5252
docker_build(

build/common.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,39 +97,39 @@ kube::build::get_docker_wrapped_binaries() {
9797
kube-apiserver,busybox
9898
kube-controller-manager,busybox
9999
kube-scheduler,busybox
100-
kubernetes-discovery,busybox
100+
kube-aggregator,busybox
101101
kube-proxy,gcr.io/google_containers/debian-iptables-amd64:v4
102102
);;
103103
"arm")
104104
local targets=(
105105
kube-apiserver,armel/busybox
106106
kube-controller-manager,armel/busybox
107107
kube-scheduler,armel/busybox
108-
kubernetes-discovery,armel/busybox
108+
kube-aggregator,armel/busybox
109109
kube-proxy,gcr.io/google_containers/debian-iptables-arm:v4
110110
);;
111111
"arm64")
112112
local targets=(
113113
kube-apiserver,aarch64/busybox
114114
kube-controller-manager,aarch64/busybox
115115
kube-scheduler,aarch64/busybox
116-
kubernetes-discovery,aarch64/busybox
116+
kube-aggregator,aarch64/busybox
117117
kube-proxy,gcr.io/google_containers/debian-iptables-arm64:v4
118118
);;
119119
"ppc64le")
120120
local targets=(
121121
kube-apiserver,ppc64le/busybox
122122
kube-controller-manager,ppc64le/busybox
123123
kube-scheduler,ppc64le/busybox
124-
kubernetes-discovery,ppc64le/busybox
124+
kube-aggregator,ppc64le/busybox
125125
kube-proxy,gcr.io/google_containers/debian-iptables-ppc64le:v4
126126
);;
127127
"s390x")
128128
local targets=(
129129
kube-apiserver,s390x/busybox
130130
kube-controller-manager,s390x/busybox
131131
kube-scheduler,s390x/busybox
132-
kubernetes-discovery,s390x/busybox
132+
kube-aggregator,s390x/busybox
133133
kube-proxy,gcr.io/google_containers/debian-iptables-s390x:v4
134134
);;
135135
esac

build/debs/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ filegroup(
3232
"kube-apiserver",
3333
"kube-controller-manager",
3434
"kube-proxy",
35-
"kubernetes-discovery",
35+
"kube-aggregator",
3636
]]
3737

3838
deb_data(
@@ -116,7 +116,7 @@ k8s_deb(
116116
)
117117

118118
k8s_deb(
119-
name = "kubernetes-discovery",
119+
name = "kube-aggregator",
120120
description = "Kubernetes Federated API Server",
121121
)
122122

cmd/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ filegroup(
2323
"//cmd/genutils:all-srcs",
2424
"//cmd/genyaml:all-srcs",
2525
"//cmd/hyperkube:all-srcs",
26+
"//cmd/kube-aggregator:all-srcs",
2627
"//cmd/kube-apiserver:all-srcs",
2728
"//cmd/kube-controller-manager:all-srcs",
2829
"//cmd/kube-discovery:all-srcs",
@@ -31,7 +32,6 @@ filegroup(
3132
"//cmd/kubectl:all-srcs",
3233
"//cmd/kubelet:all-srcs",
3334
"//cmd/kubemark:all-srcs",
34-
"//cmd/kubernetes-discovery:all-srcs",
3535
"//cmd/libs/go2idl/client-gen:all-srcs",
3636
"//cmd/libs/go2idl/conversion-gen:all-srcs",
3737
"//cmd/libs/go2idl/deepcopy-gen:all-srcs",

cmd/kube-aggregator/BUILD

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
licenses(["notice"])
4+
5+
load(
6+
"@io_bazel_rules_go//go:def.bzl",
7+
"go_binary",
8+
"go_library",
9+
)
10+
11+
go_library(
12+
name = "go_default_library",
13+
srcs = ["main.go"],
14+
tags = ["automanaged"],
15+
deps = [
16+
"//cmd/kube-aggregator/pkg/apis/apiregistration/install:go_default_library",
17+
"//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library",
18+
"//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
19+
"//cmd/kube-aggregator/pkg/client/informers/apiregistration/internalversion:go_default_library",
20+
"//cmd/kube-aggregator/pkg/client/informers/apiregistration/v1alpha1:go_default_library",
21+
"//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library",
22+
"//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:go_default_library",
23+
"//cmd/kube-aggregator/pkg/cmd/server:go_default_library",
24+
"//pkg/kubectl/cmd/util:go_default_library",
25+
"//pkg/util/logs:go_default_library",
26+
],
27+
)
28+
29+
filegroup(
30+
name = "package-srcs",
31+
srcs = glob(["**"]),
32+
tags = ["automanaged"],
33+
visibility = ["//visibility:private"],
34+
)
35+
36+
filegroup(
37+
name = "all-srcs",
38+
srcs = [
39+
":package-srcs",
40+
"//cmd/kube-aggregator/pkg/apis/apiregistration:all-srcs",
41+
"//cmd/kube-aggregator/pkg/apiserver:all-srcs",
42+
"//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:all-srcs",
43+
"//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:all-srcs",
44+
"//cmd/kube-aggregator/pkg/client/informers:all-srcs",
45+
"//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:all-srcs",
46+
"//cmd/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:all-srcs",
47+
"//cmd/kube-aggregator/pkg/cmd/server:all-srcs",
48+
"//cmd/kube-aggregator/pkg/legacy:all-srcs",
49+
"//cmd/kube-aggregator/pkg/registry/apiservice:all-srcs",
50+
],
51+
tags = ["automanaged"],
52+
)
53+
54+
go_binary(
55+
name = "kube-aggregator",
56+
library = ":go_default_library",
57+
tags = ["automanaged"],
58+
)

0 commit comments

Comments
 (0)