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

Merge pull request #45239 from ixdy/bazel-cloud-controller-manager-docker
f3b0ad25 · Kubernetes Submit Queue · GitHub · 7f2011c1 · 37eb292b · f3b0ad25
Commit f3b0ad25 authored May 02, 2017 by Kubernetes Submit Queue Committed by GitHub May 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

BUILD build/BUILD +6 -0

common.sh build/common.sh +2 -0

BUILD build/debs/BUILD +7 -0

No files found.
--- a/build/BUILD
+++ b/build/BUILD
@@ -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",

--- a/build/common.sh
+++ b/build/common.sh
@@ -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=(

--- a/build/debs/BUILD
+++ b/build/debs/BUILD
@@ -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",
@@ -84,6 +86,11 @@ pkg_tar(
 )

 k8s_deb(
+    name = "cloud-controller-manager",
+    description = "Kubernetes Cloud Controller Manager",
+)
+
+k8s_deb(
    name = "kubectl",
    description = """Kubernetes Command Line Tool
 The Kubernetes command line tool for interacting with the Kubernetes API.