github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25051 from spxtr/fix-1.6.2

Browse Source 
Automatic merge from submit-queue

Use v1.6.2-1 tag for build.

Is there any reason these don't use the VERSION file like everything else? cc @luxas @ixdy
This commit is contained in:
k8s-merge-robot 2016-05-05 03:36:27 -07:00
commit c79c5864e7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -48,7 +48,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"
# Constants # Constants
readonly KUBE_BUILD_IMAGE_REPO=kube-build readonly KUBE_BUILD_IMAGE_REPO=kube-build
readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.0-2" readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.2-1"
# KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>" # KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"
# Here we map the output directories across both the local and remote _output # Here we map the output directories across both the local and remote _output

2
cluster/images/flannel/Makefile
View File

@ -20,7 +20,7 @@
TAG?=0.5.5 TAG?=0.5.5
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
KUBE_CROSS_TAG=v1.6.0-2 KUBE_CROSS_TAG=v1.6.2-1
GOARM=6 GOARM=6
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE?=gcr.io/google_containers/debian-iptables-${ARCH}:v2 BASEIMAGE?=gcr.io/google_containers/debian-iptables-${ARCH}:v2