Commit 37eb292b authored by Jeff Grafton's avatar Jeff Grafton

Update bazel build to dockerize cloud-controller-manager

parent 8705dbaa
...@@ -44,7 +44,13 @@ docker_build( ...@@ -44,7 +44,13 @@ docker_build(
], ],
) )
# This list should roughly match kube::build::get_docker_wrapped_binaries()
# in build/common.sh.
DOCKERIZED_BINARIES = { DOCKERIZED_BINARIES = {
"cloud-controller-manager": {
"base": ":busybox",
"target": "//cmd/cloud-controller-manager:cloud-controller-manager",
},
"kube-apiserver": { "kube-apiserver": {
"base": ":busybox", "base": ":busybox",
"target": "//cmd/kube-apiserver:kube-apiserver", "target": "//cmd/kube-apiserver:kube-apiserver",
......
...@@ -86,6 +86,8 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 ...@@ -86,6 +86,8 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# $1 - server architecture # $1 - server architecture
kube::build::get_docker_wrapped_binaries() { kube::build::get_docker_wrapped_binaries() {
debian_iptables_version=v7 debian_iptables_version=v7
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD.
case $1 in case $1 in
"amd64") "amd64")
local targets=( local targets=(
......
...@@ -11,6 +11,7 @@ load("@io_kubernetes_build//defs:deb.bzl", "k8s_deb", "deb_data") ...@@ -11,6 +11,7 @@ load("@io_kubernetes_build//defs:deb.bzl", "k8s_deb", "deb_data")
filegroup( filegroup(
name = "debs", name = "debs",
srcs = [ srcs = [
":cloud-controller-manager.deb",
":kubeadm.deb", ":kubeadm.deb",
":kubectl.deb", ":kubectl.deb",
":kubelet.deb", ":kubelet.deb",
...@@ -28,6 +29,7 @@ filegroup( ...@@ -28,6 +29,7 @@ filegroup(
}, },
], ],
) for binary in [ ) for binary in [
"cloud-controller-manager",
"kubectl", "kubectl",
"kube-apiserver", "kube-apiserver",
"kube-controller-manager", "kube-controller-manager",
...@@ -84,6 +86,11 @@ pkg_tar( ...@@ -84,6 +86,11 @@ pkg_tar(
) )
k8s_deb( k8s_deb(
name = "cloud-controller-manager",
description = "Kubernetes Cloud Controller Manager",
)
k8s_deb(
name = "kubectl", name = "kubectl",
description = """Kubernetes Command Line Tool description = """Kubernetes Command Line Tool
The Kubernetes command line tool for interacting with the Kubernetes API. The Kubernetes command line tool for interacting with the Kubernetes API.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment