Skip to content

K
k3s
Commit a91cf1ed authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #41771 from cblecker/go-1.7.5

Automatic merge from submit-queue (batch tested with PRs 41812, 41665, 40007, 41281, 41771) Bump golang versions to 1.7.5 **What this PR does / why we need it**: While #41636 might not make it in until 1.7, this would bump current golang versions from 1.7.4 to 1.7.5 to integrate the fixes from that patch version. This would include, among other things, a fix to ensure cross-built binaries for darwin don't have certificate validation errors (golang/go#18688) **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: none **Special notes for your reviewer**: **Release note**: ```release-note Upgrade golang versions to 1.7.5 ```
parents 787b1a23 c3de31c8
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
build/build-image/cross/Dockerfile
View file @ a91cf1ed
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross # This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about. # platform go binary for the architecture kubernetes cares about.
FROM golang:1.7.4 FROM golang:1.7.5
ENV GOARM 7 ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \ ENV KUBE_DYNAMIC_CROSSPLATFORMS \
......
build/cni/Makefile
View file @ a91cf1ed
...@@ -22,7 +22,7 @@ CNI_RELEASE?=07a8a28637e97b22eb8dfe710eeae1344f69d16e ...@@ -22,7 +22,7 @@ CNI_RELEASE?=07a8a28637e97b22eb8dfe710eeae1344f69d16e
CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz
CUR_DIR=$(shell pwd) CUR_DIR=$(shell pwd)
OUTPUT_DIR=$(CUR_DIR)/output OUTPUT_DIR=$(CUR_DIR)/output
GOLANG_VERSION=1.7.4 GOLANG_VERSION=1.7.5
all: build all: build
......
cluster/images/etcd-version-monitor/Makefile
View file @ a91cf1ed
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
# Build the etcd-version-monitor image # Build the etcd-version-monitor image
# #
# Usage: # Usage:
# [GOLANG_VERSION=1.7.4] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push) # [GOLANG_VERSION=1.7.5] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push)
# TODO(shyamjvs): Support architectures other than amd64 if needed. # TODO(shyamjvs): Support architectures other than amd64 if needed.
ARCH:=amd64 ARCH:=amd64
GOLANG_VERSION?=1.7.4 GOLANG_VERSION?=1.7.5
REGISTRY?=gcr.io/google-containers REGISTRY?=gcr.io/google-containers
TAG?=0.1.0 TAG?=0.1.0
IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG) IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)
......
cluster/images/etcd/Makefile
View file @ a91cf1ed
...@@ -30,7 +30,7 @@ TAGS?=2.2.1 2.3.7 3.0.14 ...@@ -30,7 +30,7 @@ TAGS?=2.2.1 2.3.7 3.0.14
REGISTRY_TAG?=3.0.14 REGISTRY_TAG?=3.0.14
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
GOLANG_VERSION?=1.7.4 GOLANG_VERSION?=1.7.5
GOARM=7 GOARM=7
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
......
test/images/serve_hostname/Makefile
View file @ a91cf1ed
...@@ -31,7 +31,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x ...@@ -31,7 +31,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x
GOARM=7 GOARM=7
TEMP_DIR := $(shell mktemp -d) TEMP_DIR := $(shell mktemp -d)
GOLANG_VERSION=1.7.4 GOLANG_VERSION=1.7.5
BIN = serve_hostname BIN = serve_hostname
SRCS = serve_hostname.go SRCS = serve_hostname.go
......
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