Merge pull request #45239 from ixdy/bazel-cloud-controller-manager-docker

Automatic merge from submit-queue (batch tested with PRs 45239, 45230)

Update bazel build to dockerize cloud-controller-manager

**What this PR does / why we need it**: followup to #45154. Also added a comment so that hopefully this sort of followup isn't needed again. :)

**Release note**:

```release-note
NONE
```

/assign @mikedanese @luxas
This commit is contained in:
Kubernetes Submit Queue
2017-05-02 14:11:51 -07:00
committed by GitHub
3 changed files with 15 additions and 0 deletions

View File

@@ -44,7 +44,13 @@ docker_build(
],
)
# This list should roughly match kube::build::get_docker_wrapped_binaries()
# in build/common.sh.
DOCKERIZED_BINARIES = {
"cloud-controller-manager": {
"base": ":busybox",
"target": "//cmd/cloud-controller-manager:cloud-controller-manager",
},
"kube-apiserver": {
"base": ":busybox",
"target": "//cmd/kube-apiserver:kube-apiserver",

View File

@@ -86,6 +86,8 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# $1 - server architecture
kube::build::get_docker_wrapped_binaries() {
debian_iptables_version=v7
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD.
case $1 in
"amd64")
local targets=(

View File

@@ -11,6 +11,7 @@ load("@io_kubernetes_build//defs:deb.bzl", "k8s_deb", "deb_data")
filegroup(
name = "debs",
srcs = [
":cloud-controller-manager.deb",
":kubeadm.deb",
":kubectl.deb",
":kubelet.deb",
@@ -28,6 +29,7 @@ filegroup(
},
],
) for binary in [
"cloud-controller-manager",
"kubectl",
"kube-apiserver",
"kube-controller-manager",
@@ -83,6 +85,11 @@ pkg_tar(
deps = ["@kubernetes_cni//file"],
)
k8s_deb(
name = "cloud-controller-manager",
description = "Kubernetes Cloud Controller Manager",
)
k8s_deb(
name = "kubectl",
description = """Kubernetes Command Line Tool