Merge pull request #81390 from cblecker/go-1.12.8

Update to go 1.12.8
This commit is contained in:
Kubernetes Prow Robot 2019-08-14 16:53:15 -07:00 committed by GitHub
commit 3526a6162e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 18 deletions

View File

@ -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.12.7 FROM golang:1.12.8
ENV GOARM 7 ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \ ENV KUBE_DYNAMIC_CROSSPLATFORMS \

View File

@ -1 +1 @@
v1.12.7-1 v1.12.8-1

View File

@ -34,7 +34,7 @@ dependencies:
- name: "golang" - name: "golang"
version: 1.12.7 version: 1.12.8
refPaths: refPaths:
- path: build/build-image/cross/Dockerfile - path: build/build-image/cross/Dockerfile
match: "golang:" match: "golang:"
@ -85,4 +85,3 @@ dependencies:
match: CRI_TOOLS_VERSION = match: CRI_TOOLS_VERSION =
- path: cluster/gce/gci/configure.sh - path: cluster/gce/gci/configure.sh
match: DEFAULT_CRICTL_VERSION= match: DEFAULT_CRICTL_VERSION=

View File

@ -44,8 +44,8 @@ http_archive(
http_archive( http_archive(
name = "io_bazel_rules_go", name = "io_bazel_rules_go",
sha256 = "38113392bac83252d2e6450b0056e41f35b2469903e319688883598ce38f0377", sha256 = "2f09c340da7b4c14d2475f9c8c9d20c633740100345df67b97864d4f86dbe518",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.8/rules_go-0.17.8.tar.gz"), urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.18.8/rules_go-0.18.8.tar.gz"),
) )
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
@ -53,7 +53,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains( go_register_toolchains(
go_version = "1.12.7", go_version = "1.12.8",
) )
http_archive( http_archive(

View File

@ -16,7 +16,7 @@
import boilerplate import boilerplate
import unittest import unittest
import StringIO from io import StringIO
import os import os
import sys import sys

View File

@ -159,7 +159,7 @@ func TestWithValidThumbprint(t *testing.T) {
func TestWithInvalidCaCertPath(t *testing.T) { func TestWithInvalidCaCertPath(t *testing.T) {
connection := &vclib.VSphereConnection{ connection := &vclib.VSphereConnection{
Hostname: "should-not-matter", Hostname: "should-not-matter",
Port: "should-not-matter", Port: "27015", // doesn't matter, but has to be a valid port
CACert: "invalid-path", CACert: "invalid-path",
} }
@ -172,7 +172,7 @@ func TestWithInvalidCaCertPath(t *testing.T) {
func TestInvalidCaCert(t *testing.T) { func TestInvalidCaCert(t *testing.T) {
connection := &vclib.VSphereConnection{ connection := &vclib.VSphereConnection{
Hostname: "should-not-matter", Hostname: "should-not-matter",
Port: "should-not-matter", Port: "27015", // doesn't matter, but has to be a valid port
CACert: fixtures.InvalidCertPath, CACert: fixtures.InvalidCertPath,
} }

View File

@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest
REGISTRY ?= gcr.io/kubernetes-e2e-test-images REGISTRY ?= gcr.io/kubernetes-e2e-test-images
GOARM ?= 7 GOARM ?= 7
QEMUVERSION=v2.9.1 QEMUVERSION=v2.9.1
GOLANG_VERSION=1.12.7 GOLANG_VERSION=1.12.8
export export
ifndef WHAT ifndef WHAT