From f2a4522be1bf7878de138258f527a52e993afc98 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Tue, 13 Aug 2019 20:20:45 -0700 Subject: [PATCH 1/3] Update to go 1.12.8 --- build/build-image/cross/Dockerfile | 2 +- build/build-image/cross/VERSION | 2 +- build/dependencies.yaml | 17 ++++++++--------- build/root/WORKSPACE | 6 +++--- test/images/Makefile | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 051f8bed623..b74969c534d 100644 --- a/build/build-image/cross/Dockerfile +++ b/build/build-image/cross/Dockerfile @@ -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.12.7 +FROM golang:1.12.8 ENV GOARM 7 ENV KUBE_DYNAMIC_CROSSPLATFORMS \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index e71b7503261..1c924e1432a 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.12.7-1 +v1.12.8-1 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 140aa2d4a0d..48739c27b4e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -3,9 +3,9 @@ dependencies: version: 3.3.10 refPaths: - path: cluster/gce/manifests/etcd.manifest - match: etcd_docker_tag|etcd_version + match: etcd_docker_tag|etcd_version - path: build/workspace.bzl - match: ETCD_VERSION + match: ETCD_VERSION - path: cluster/gce/manifests/etcd-empty-dir-cleanup.yaml match: k8s.gcr.io/etcd-empty-dir-cleanup - path: cluster/gce/upgrade-aliases.sh @@ -22,7 +22,7 @@ dependencies: - path: staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml match: quay.io/coreos/etcd - path: test/e2e/framework/nodes_util.go - match: const etcdImage + match: const etcdImage - name: "docker" version: 18.09 @@ -31,10 +31,10 @@ dependencies: match: latestValidatedDockerVersion - path: cmd/kubeadm/app/util/system/docker_validator_test.go match: ServerVersion - + - name: "golang" - version: 1.12.7 + version: 1.12.8 refPaths: - path: build/build-image/cross/Dockerfile match: "golang:" @@ -43,7 +43,7 @@ dependencies: match: go_version - path: test/images/Makefile match: GOLANG_VERSION - + - name: "cni" version: 0.7.5 @@ -60,7 +60,7 @@ dependencies: match: DEFAULT_CNI_VERSION= - path: test/e2e_node/remote/utils.go match: cniVersion[\t\n\f\r ]*= - + - name: "coredns-kube-up" version: 1.3.1 @@ -79,10 +79,9 @@ dependencies: match: CoreDNSVersion = - name: "crictl" - version: 1.14.0 + version: 1.14.0 refPaths: - path: build/workspace.bzl match: CRI_TOOLS_VERSION = - path: cluster/gce/gci/configure.sh match: DEFAULT_CRICTL_VERSION= - diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 53588303faa..5b3a4fb7172 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -44,8 +44,8 @@ http_archive( http_archive( name = "io_bazel_rules_go", - sha256 = "38113392bac83252d2e6450b0056e41f35b2469903e319688883598ce38f0377", - urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.8/rules_go-0.17.8.tar.gz"), + sha256 = "2f09c340da7b4c14d2475f9c8c9d20c633740100345df67b97864d4f86dbe518", + 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") @@ -53,7 +53,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies() go_register_toolchains( - go_version = "1.12.7", + go_version = "1.12.8", ) http_archive( diff --git a/test/images/Makefile b/test/images/Makefile index 2cd0ee16722..f01d6122050 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -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.12.7 +GOLANG_VERSION=1.12.8 export ifndef WHAT From 12dbfcbdf35f8d846f39eee4898d032aa6729ab9 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Tue, 13 Aug 2019 20:21:11 -0700 Subject: [PATCH 2/3] Fix up failing boilerplate test --- hack/boilerplate/boilerplate_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/boilerplate/boilerplate_test.py b/hack/boilerplate/boilerplate_test.py index b8d5b8e9e0f..66453045f76 100644 --- a/hack/boilerplate/boilerplate_test.py +++ b/hack/boilerplate/boilerplate_test.py @@ -16,7 +16,7 @@ import boilerplate import unittest -import StringIO +from io import StringIO import os import sys From f713ec89ed81b0860b9b312987529dc5534d0824 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Tue, 13 Aug 2019 21:50:36 -0700 Subject: [PATCH 3/3] Fix malformed port in vsphere cloud provider test The port name previously didn't matter on these tests, but is now actively being checked in go1.12.8 and higher. https://github.com/golang/go/commit/3226f2d492963d361af9dfc6714ef141ba606713 --- .../legacy-cloud-providers/vsphere/vclib/connection_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection_test.go index faa0a2d8649..046b3de8a13 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection_test.go @@ -159,7 +159,7 @@ func TestWithValidThumbprint(t *testing.T) { func TestWithInvalidCaCertPath(t *testing.T) { connection := &vclib.VSphereConnection{ Hostname: "should-not-matter", - Port: "should-not-matter", + Port: "27015", // doesn't matter, but has to be a valid port CACert: "invalid-path", } @@ -172,7 +172,7 @@ func TestWithInvalidCaCertPath(t *testing.T) { func TestInvalidCaCert(t *testing.T) { connection := &vclib.VSphereConnection{ Hostname: "should-not-matter", - Port: "should-not-matter", + Port: "27015", // doesn't matter, but has to be a valid port CACert: fixtures.InvalidCertPath, }