Skip to content

K
k3s
Commit c79c5864 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #25051 from spxtr/fix-1.6.2

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
parents 0e2ecb7a f128b303
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
build/common.sh
View file @ c79c5864
...@@ -48,7 +48,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}" ...@@ -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
......
cluster/images/flannel/Makefile
View file @ c79c5864
...@@ -20,7 +20,7 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment