mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
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 ```
This commit is contained in:
commit
a91cf1ed94
@ -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.7.4
|
||||
FROM golang:1.7.5
|
||||
|
||||
ENV GOARM 7
|
||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
||||
|
@ -1 +1 @@
|
||||
v1.7.4-2
|
||||
v1.7.5-1
|
||||
|
@ -22,7 +22,7 @@ CNI_RELEASE?=07a8a28637e97b22eb8dfe710eeae1344f69d16e
|
||||
CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz
|
||||
CUR_DIR=$(shell pwd)
|
||||
OUTPUT_DIR=$(CUR_DIR)/output
|
||||
GOLANG_VERSION=1.7.4
|
||||
GOLANG_VERSION=1.7.5
|
||||
|
||||
all: build
|
||||
|
||||
|
@ -15,10 +15,10 @@
|
||||
# Build the etcd-version-monitor image
|
||||
#
|
||||
# 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.
|
||||
ARCH:=amd64
|
||||
GOLANG_VERSION?=1.7.4
|
||||
GOLANG_VERSION?=1.7.5
|
||||
REGISTRY?=gcr.io/google-containers
|
||||
TAG?=0.1.0
|
||||
IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)
|
||||
|
@ -30,7 +30,7 @@ TAGS?=2.2.1 2.3.7 3.0.14
|
||||
REGISTRY_TAG?=3.0.14
|
||||
ARCH?=amd64
|
||||
REGISTRY?=gcr.io/google_containers
|
||||
GOLANG_VERSION?=1.7.4
|
||||
GOLANG_VERSION?=1.7.5
|
||||
GOARM=7
|
||||
TEMP_DIR:=$(shell mktemp -d)
|
||||
|
||||
|
@ -31,7 +31,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x
|
||||
|
||||
GOARM=7
|
||||
TEMP_DIR := $(shell mktemp -d)
|
||||
GOLANG_VERSION=1.7.4
|
||||
GOLANG_VERSION=1.7.5
|
||||
|
||||
BIN = serve_hostname
|
||||
SRCS = serve_hostname.go
|
||||
|
Loading…
Reference in New Issue
Block a user