From 37eb292bc00f0141ef571b954c8725cfff2a55d1 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Tue, 2 May 2017 12:01:13 -0700
Subject: [PATCH] Update bazel build to dockerize cloud-controller-manager

---
 build/BUILD      | 6 ++++++
 build/common.sh  | 2 ++
 build/debs/BUILD | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/build/BUILD b/build/BUILD
index aa56893e95b..82760f615a8 100644
--- 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",
diff --git a/build/common.sh b/build/common.sh
index 169cff7ae0e..8db8983abc4 100755
--- 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=(
diff --git a/build/debs/BUILD b/build/debs/BUILD
index 023b0568172..942b9ca2794 100644
--- 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",
@@ -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