From a8395998830c674dd7d213d66e7b565b3a0b5c00 Mon Sep 17 00:00:00 2001
From: Joe Beda <joe.github@bedafamily.com>
Date: Fri, 7 Nov 2014 16:49:32 -0800
Subject: [PATCH] Install client tools on master.

We now include kubecfg and kubectl in "server binary" tar and place them into /usr/local/bin on the master.
---
 build/common.sh                             |  4 ++++
 cluster/saltbase/salt/kube-client-tools.sls | 13 +++++++++++++
 cluster/saltbase/salt/top.sls               |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 cluster/saltbase/salt/kube-client-tools.sls

diff --git a/build/common.sh b/build/common.sh
index a69eaaa3f4c..65dc8469a26 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -515,6 +515,10 @@ function kube::release::package_server_tarballs() {
     cp "${KUBE_SERVER_BINARIES[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
       "${release_stage}/server/bin/"
 
+    # Include the client binaries here too as they are useful debugging tools.
+    cp "${KUBE_CLIENT_BINARIES[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
+      "${release_stage}/server/bin/"
+
     local package_name="${RELEASE_DIR}/kubernetes-server-${platform_tag}.tar.gz"
     kube::release::create_tarball "${package_name}" "${release_stage}/.."
   done
diff --git a/cluster/saltbase/salt/kube-client-tools.sls b/cluster/saltbase/salt/kube-client-tools.sls
new file mode 100644
index 00000000000..3d0e3eab787
--- /dev/null
+++ b/cluster/saltbase/salt/kube-client-tools.sls
@@ -0,0 +1,13 @@
+/usr/local/bin/kubecfg:
+  file.managed:
+    - source: salt://kube-bins/kubecfg
+    - user: root
+    - group: root
+    - mode: 755
+
+/usr/local/bin/kubectl:
+  file.managed:
+    - source: salt://kube-bins/kubectl
+    - user: root
+    - group: root
+    - mode: 755
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index e45d1fb0b8c..53fc83c0a8f 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -31,6 +31,7 @@ base:
     - controller-manager
     - scheduler
     - nginx
+    - kube-client-tools
     - logrotate
 {% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
     - openvpn