From a333cf429abc332bc88c141205d0fa7b8b4353ca Mon Sep 17 00:00:00 2001
From: Jess Frazelle <me@jessfraz.com>
Date: Mon, 18 Jul 2016 14:10:12 -0400
Subject: [PATCH] update go to 1.6.3

Signed-off-by: Jess Frazelle <me@jessfraz.com>
---
 build/build-image/cross/Dockerfile    | 2 +-
 build/build-image/cross/VERSION       | 2 +-
 build/common.sh                       | 4 ++--
 hack/jenkins/dockerized-e2e-runner.sh | 2 +-
 hack/jenkins/gotest-dockerized.sh     | 2 +-
 hack/jenkins/test-image/Dockerfile    | 2 +-
 hack/jenkins/test-image/Makefile      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index dd8d8054b83..379d80a1073 100644
--- a/build/build-image/cross/Dockerfile
+++ b/build/build-image/cross/Dockerfile
@@ -15,7 +15,7 @@
 # This file creates a standard build environment for building cross
 # platform go binary for the architecture kubernetes cares about.
 
-FROM golang:1.6.2
+FROM golang:1.6.3
 
 ENV GOARM 6
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index 4d9054700c4..0400c13c4e3 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.6.2-2
+v1.6.3-0
diff --git a/build/common.sh b/build/common.sh
index 5353c6fc8f2..b70bf1b6d8d 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -45,7 +45,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"
 
 # Constants
 readonly KUBE_BUILD_IMAGE_REPO=kube-build
-readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.2-2"
+readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.3-0"
 # KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"
 
 # Here we map the output directories across both the local and remote _output
@@ -173,7 +173,7 @@ function kube::build::docker_available_on_osx() {
       kube::log::status "Using Docker for MacOS"
       return 0
     fi
-    
+
     kube::log::status "No docker host is set. Checking options for setting one..."
     if [[ -z "$(which docker-machine)" && -z "$(which boot2docker)" ]]; then
       kube::log::status "It looks like you're running Mac OS X, yet none of Docker for Mac, docker-machine or boot2docker are on the path."
diff --git a/hack/jenkins/dockerized-e2e-runner.sh b/hack/jenkins/dockerized-e2e-runner.sh
index 4ff3415ae5a..fc4f3661229 100755
--- a/hack/jenkins/dockerized-e2e-runner.sh
+++ b/hack/jenkins/dockerized-e2e-runner.sh
@@ -61,5 +61,5 @@ docker run --rm=true -i \
   -e "WORKSPACE=/workspace" \
   ${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \
   "${docker_extra_args[@]:+${docker_extra_args[@]}}" \
-  gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev3 \
+  gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev1 \
   bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"
diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh
index 11b8bf85e5b..af48fbc6b7d 100755
--- a/hack/jenkins/gotest-dockerized.sh
+++ b/hack/jenkins/gotest-dockerized.sh
@@ -44,5 +44,5 @@ docker run --rm=true \
   -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
   -e "REPO_DIR=${REPO_DIR}" \
   -e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \
-  -i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev3 \
+  -i gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev1 \
   bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"
diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile
index 14125bdd0db..f18e68302f8 100644
--- a/hack/jenkins/test-image/Dockerfile
+++ b/hack/jenkins/test-image/Dockerfile
@@ -15,7 +15,7 @@
 # This file creates a build environment for building and running kubernetes
 # unit and integration tests
 
-FROM golang:1.6.2
+FROM golang:1.6.3
 MAINTAINER  Jeff Lowdermilk <jeffml@google.com>
 
 ENV WORKSPACE               /workspace
diff --git a/hack/jenkins/test-image/Makefile b/hack/jenkins/test-image/Makefile
index eb1c7c8fe93..b2ddeef71e7 100644
--- a/hack/jenkins/test-image/Makefile
+++ b/hack/jenkins/test-image/Makefile
@@ -16,7 +16,7 @@ all: push
 
 # Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
 # These versions are specified in the Dockerfile
-TAG = go1.6.2-docker1.9.1-rev3
+TAG = go1.6.3-docker1.9.1-rev1
 
 container:
 	docker build -t gcr.io/google_containers/kubekins-test .