mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #74632 from cblecker/go-1.12
Update to use golang 1.12
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.11.5
 | 
			
		||||
FROM golang:1.12.0
 | 
			
		||||
 | 
			
		||||
ENV GOARM 7
 | 
			
		||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
v1.11.5-1
 | 
			
		||||
v1.12.0-1
 | 
			
		||||
 
 | 
			
		||||
@@ -31,8 +31,8 @@ http_archive(
 | 
			
		||||
 | 
			
		||||
http_archive(
 | 
			
		||||
    name = "io_bazel_rules_go",
 | 
			
		||||
    sha256 = "492c3ac68ed9dcf527a07e6a1b2dcbf199c6bf8b35517951467ac32e421c06c1",
 | 
			
		||||
    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.0/rules_go-0.17.0.tar.gz"),
 | 
			
		||||
    sha256 = "6776d68ebb897625dead17ae510eac3d5f6342367327875210df44dbe2aeeb19",
 | 
			
		||||
    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.1/rules_go-0.17.1.tar.gz"),
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 | 
			
		||||
@@ -40,7 +40,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 | 
			
		||||
go_rules_dependencies()
 | 
			
		||||
 | 
			
		||||
go_register_toolchains(
 | 
			
		||||
    go_version = "1.11.5",
 | 
			
		||||
    go_version = "1.12",
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
http_archive(
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@ include  ../../hack/make-rules/Makefile.manifest
 | 
			
		||||
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
 | 
			
		||||
GOARM=7
 | 
			
		||||
QEMUVERSION=v2.9.1
 | 
			
		||||
GOLANG_VERSION=1.11.5
 | 
			
		||||
GOLANG_VERSION=1.12.0
 | 
			
		||||
export
 | 
			
		||||
 | 
			
		||||
ifndef WHAT
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user