Merge pull request #38984 from deads2k/fed-16-make-image

Automatic merge from submit-queue create kuberentes-discovery image Creates an image for `kubernetes-discovery` since this is the API registration, aggregation, and proxy image.

Merge pull request #38984 from deads2k/fed-16-make-image
46afb00f · Kubernetes Submit Queue · GitHub · d0582409 · 47073be3 · 46afb00f
Commit 46afb00f authored Dec 20, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

BUILD build/BUILD +1 -0

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

golang.sh hack/lib/golang.sh +2 -0

No files found.
--- a/build/BUILD
+++ b/build/BUILD
@@ -6,6 +6,7 @@ server_binaries = {
    "kube-apiserver": "//cmd/kube-apiserver",
    "kube-controller-manager": "//cmd/kube-controller-manager",
    "kube-scheduler": "//plugin/cmd/kube-scheduler",
+    "kubernetes-discovery": "//cmd/kubernetes-discovery",
 }

 docker_build(

--- a/build/common.sh
+++ b/build/common.sh
@@ -97,6 +97,7 @@ kube::build::get_docker_wrapped_binaries() {
          kube-apiserver,busybox
          kube-controller-manager,busybox
          kube-scheduler,busybox
+          kubernetes-discovery,busybox
          kube-proxy,gcr.io/google_containers/debian-iptables-amd64:v4
        );;
    "arm")
@@ -104,6 +105,7 @@ kube::build::get_docker_wrapped_binaries() {
          kube-apiserver,armel/busybox
          kube-controller-manager,armel/busybox
          kube-scheduler,armel/busybox
+          kubernetes-discovery,armel/busybox
          kube-proxy,gcr.io/google_containers/debian-iptables-arm:v4
        );;
    "arm64")
@@ -111,6 +113,7 @@ kube::build::get_docker_wrapped_binaries() {
          kube-apiserver,aarch64/busybox
          kube-controller-manager,aarch64/busybox
          kube-scheduler,aarch64/busybox
+          kubernetes-discovery,aarch64/busybox
          kube-proxy,gcr.io/google_containers/debian-iptables-arm64:v4
        );;
    "ppc64le")
@@ -118,6 +121,7 @@ kube::build::get_docker_wrapped_binaries() {
          kube-apiserver,ppc64le/busybox
          kube-controller-manager,ppc64le/busybox
          kube-scheduler,ppc64le/busybox
+          kubernetes-discovery,ppc64le/busybox
          kube-proxy,gcr.io/google_containers/debian-iptables-ppc64le:v4
        );;
    "s390x")
@@ -125,6 +129,7 @@ kube::build::get_docker_wrapped_binaries() {
          kube-apiserver,s390x/busybox
          kube-controller-manager,s390x/busybox
          kube-scheduler,s390x/busybox
+          kubernetes-discovery,s390x/busybox
          kube-proxy,gcr.io/google_containers/debian-iptables-s390x:v4
        );;		
  esac

--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -31,6 +31,7 @@ kube::golang::server_targets() {
    cmd/kubeadm
    cmd/hyperkube
    cmd/kube-discovery
+    cmd/kubernetes-discovery
    plugin/cmd/kube-scheduler
  )
  echo "${targets[@]}"
@@ -165,6 +166,7 @@ readonly KUBE_STATIC_LIBRARIES=(
  kube-scheduler
  kube-proxy
  kube-discovery
+  kubernetes-discovery
  kubeadm
  kubectl
 )