[Federation] Do not build separate binaries for federation control plane components, hyperkube should be sufficient.
Also build the hyperkube docker image on-the-fly. This is only a temporary fix until the proposal in issue https://github.com/kubernetes/kubernetes/issues/28630 is implemented. Also, the new build/deployment method completely obviates this step. We use debian image instead of busybox and do not build hyperkube as a static binary yet. Wait until PR https://github.com/kubernetes/kubernetes/pull/26028 is merged to build static hyperkube binaries.
This commit is contained in:
@@ -37,8 +37,6 @@ kube::golang::server_targets() {
|
||||
cmd/kubelet
|
||||
cmd/kubemark
|
||||
cmd/hyperkube
|
||||
federation/cmd/federation-apiserver
|
||||
federation/cmd/federation-controller-manager
|
||||
plugin/cmd/kube-scheduler
|
||||
)
|
||||
if [ -n "${KUBERNETES_CONTRIB:-}" ]; then
|
||||
@@ -175,8 +173,6 @@ readonly KUBE_STATIC_LIBRARIES=(
|
||||
kube-scheduler
|
||||
kube-proxy
|
||||
kubectl
|
||||
federation-apiserver
|
||||
federation-controller-manager
|
||||
)
|
||||
|
||||
kube::golang::is_statically_linked_library() {
|
||||
|
@@ -197,8 +197,13 @@ kube::util::gen-docs() {
|
||||
"${genkubedocs}" "${dest}/docs/admin/" "kube-proxy"
|
||||
"${genkubedocs}" "${dest}/docs/admin/" "kube-scheduler"
|
||||
"${genkubedocs}" "${dest}/docs/admin/" "kubelet"
|
||||
|
||||
# We don't really need federation-apiserver and federation-controller-manager
|
||||
# binaries to generate the docs. We just pass their names to decide which docs
|
||||
# to generate. The actual binary for running federation is hyperkube.
|
||||
"${genfeddocs}" "${dest}/docs/admin/" "federation-apiserver"
|
||||
"${genfeddocs}" "${dest}/docs/admin/" "federation-controller-manager"
|
||||
|
||||
mkdir -p "${dest}/docs/man/man1/"
|
||||
"${genman}" "${dest}/docs/man/man1/"
|
||||
mkdir -p "${dest}/docs/yaml/kubectl/"
|
||||
|
Reference in New Issue
Block a user