Skip to content

Commit 3526a61

Browse files
authored
Merge pull request kubernetes#81390 from cblecker/go-1.12.8
Update to go 1.12.8
2 parents 93e9abe + f713ec8 commit 3526a61

File tree

7 files changed

+17
-18
lines changed

7 files changed

+17
-18
lines changed

build/build-image/cross/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# This file creates a standard build environment for building cross
1616
# platform go binary for the architecture kubernetes cares about.
1717

18-
FROM golang:1.12.7
18+
FROM golang:1.12.8
1919

2020
ENV GOARM 7
2121
ENV KUBE_DYNAMIC_CROSSPLATFORMS \

build/build-image/cross/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.12.7-1
1+
v1.12.8-1

build/dependencies.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ dependencies:
33
version: 3.3.10
44
refPaths:
55
- path: cluster/gce/manifests/etcd.manifest
6-
match: etcd_docker_tag|etcd_version
6+
match: etcd_docker_tag|etcd_version
77
- path: build/workspace.bzl
8-
match: ETCD_VERSION
8+
match: ETCD_VERSION
99
- path: cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
1010
match: k8s.gcr.io/etcd-empty-dir-cleanup
1111
- path: cluster/gce/upgrade-aliases.sh
@@ -22,7 +22,7 @@ dependencies:
2222
- path: staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml
2323
match: quay.io/coreos/etcd
2424
- path: test/e2e/framework/nodes_util.go
25-
match: const etcdImage
25+
match: const etcdImage
2626

2727
- name: "docker"
2828
version: 18.09
@@ -31,10 +31,10 @@ dependencies:
3131
match: latestValidatedDockerVersion
3232
- path: cmd/kubeadm/app/util/system/docker_validator_test.go
3333
match: ServerVersion
34-
34+
3535

3636
- name: "golang"
37-
version: 1.12.7
37+
version: 1.12.8
3838
refPaths:
3939
- path: build/build-image/cross/Dockerfile
4040
match: "golang:"
@@ -43,7 +43,7 @@ dependencies:
4343
match: go_version
4444
- path: test/images/Makefile
4545
match: GOLANG_VERSION
46-
46+
4747

4848
- name: "cni"
4949
version: 0.7.5
@@ -60,7 +60,7 @@ dependencies:
6060
match: DEFAULT_CNI_VERSION=
6161
- path: test/e2e_node/remote/utils.go
6262
match: cniVersion[\t\n\f\r ]*=
63-
63+
6464

6565
- name: "coredns-kube-up"
6666
version: 1.3.1
@@ -79,10 +79,9 @@ dependencies:
7979
match: CoreDNSVersion =
8080

8181
- name: "crictl"
82-
version: 1.14.0
82+
version: 1.14.0
8383
refPaths:
8484
- path: build/workspace.bzl
8585
match: CRI_TOOLS_VERSION =
8686
- path: cluster/gce/gci/configure.sh
8787
match: DEFAULT_CRICTL_VERSION=
88-

build/root/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ http_archive(
4444

4545
http_archive(
4646
name = "io_bazel_rules_go",
47-
sha256 = "38113392bac83252d2e6450b0056e41f35b2469903e319688883598ce38f0377",
48-
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.8/rules_go-0.17.8.tar.gz"),
47+
sha256 = "2f09c340da7b4c14d2475f9c8c9d20c633740100345df67b97864d4f86dbe518",
48+
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.18.8/rules_go-0.18.8.tar.gz"),
4949
)
5050

5151
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
5252

5353
go_rules_dependencies()
5454

5555
go_register_toolchains(
56-
go_version = "1.12.7",
56+
go_version = "1.12.8",
5757
)
5858

5959
http_archive(

hack/boilerplate/boilerplate_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import boilerplate
1818
import unittest
19-
import StringIO
19+
from io import StringIO
2020
import os
2121
import sys
2222

staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func TestWithValidThumbprint(t *testing.T) {
159159
func TestWithInvalidCaCertPath(t *testing.T) {
160160
connection := &vclib.VSphereConnection{
161161
Hostname: "should-not-matter",
162-
Port: "should-not-matter",
162+
Port: "27015", // doesn't matter, but has to be a valid port
163163
CACert: "invalid-path",
164164
}
165165

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

test/images/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest
1717
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
1818
GOARM ?= 7
1919
QEMUVERSION=v2.9.1
20-
GOLANG_VERSION=1.12.7
20+
GOLANG_VERSION=1.12.8
2121
export
2222

2323
ifndef WHAT

0 commit comments

Comments
 (0)