mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #29127 from jfrazelle/update-go-1.6.3
Automatic merge from submit-queue update go to 1.6.3 <!-- Checklist for submitting a Pull Request Please remove this comment block before submitting. 1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). 2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md). 3. If you want this PR to automatically close an issue when it is merged, add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>` to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests). 4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below. --> ```release-note updated go version to 1.6.3 ```
This commit is contained in:
		@@ -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 \
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
v1.6.2-2
 | 
			
		||||
v1.6.3-0
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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')"
 | 
			
		||||
 
 | 
			
		||||
@@ -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}"
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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 .
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user