Skip to content

Commit f2534f2

Browse files
authored
Merge pull request kubernetes#88638 from justaugustus/go1140
Update Golang to v1.14.4
2 parents f38ce57 + b0f17c2 commit f2534f2

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

build/build-image/cross/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.13.9-5
1+
v1.14.4-2

build/dependencies.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ dependencies:
6969
match: BUNDLED_VERSIONS=
7070

7171
- name: "golang"
72-
version: 1.13.9
72+
version: 1.14.4
7373
refPaths:
7474
- path: build/build-image/cross/VERSION
75+
- path: build/root/WORKSPACE
76+
match: go_version = "\d+\.\d+\.\d+"
7577
- path: test/images/Makefile
7678
match: GOLANG_VERSION
7779

@@ -132,7 +134,7 @@ dependencies:
132134
match: tag =
133135

134136
- name: "k8s.gcr.io/kube-cross: dependents"
135-
version: v1.13.9-5
137+
version: v1.14.4-2
136138
refPaths:
137139
- path: build/build-image/cross/VERSION
138140
- path: test/images/sample-apiserver/Dockerfile
@@ -197,7 +199,7 @@ dependencies:
197199
match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+"}
198200

199201
- name: "repo-infra"
200-
version: 0.0.5
202+
version: 0.0.6
201203
refPaths:
202204
- path: build/root/WORKSPACE
203205
match: strip_prefix = "repo-infra-\d+.\d+.\d+"

build/root/WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ load("//build:workspace_mirror.bzl", "mirror")
55

66
http_archive(
77
name = "io_k8s_repo_infra",
8-
sha256 = "55e56b332ead9c32e1d53c9834a5c918a4cecd6859b70645eba6cd10372fd68f",
9-
strip_prefix = "repo-infra-0.0.5",
8+
sha256 = "7da9e67cd291e2b3b0503649d1beaf82b10c2483f4061ebe05fb7d19f62442f0",
9+
strip_prefix = "repo-infra-0.0.6",
1010
urls = [
11-
"https://github.com/kubernetes/repo-infra/archive/v0.0.5.tar.gz",
11+
"https://github.com/kubernetes/repo-infra/archive/v0.0.6.tar.gz",
1212
],
1313
)
1414

@@ -19,7 +19,7 @@ repo_infra_repositories()
1919
load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_infra_go_repositories = "go_repositories")
2020

2121
repo_infra_configure(
22-
go_version = "1.13.9",
22+
go_version = "1.14.4",
2323
minimum_bazel_version = "2.2.0",
2424
)
2525

staging/src/k8s.io/apiserver/pkg/apis/config/validation/validation.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const (
3131
keyLenErrFmt = "secret is not of the expected length, got %d, expected one of %v"
3232
unsupportedSchemeErrFmt = "unsupported scheme %q for KMS provider, only unix is supported"
3333
atLeastOneRequiredErrFmt = "at least one %s is required"
34+
invalidURLErrFmt = "invalid endpoint for kms provider, error: parse %s: net/url: invalid control character in URL"
3435
mandatoryFieldErrFmt = "%s is a mandatory field for a %s"
3536
base64EncodingErr = "secrets must be base64 encoded"
3637
zeroOrNegativeErrFmt = "%s should be a positive value"

staging/src/k8s.io/apiserver/pkg/apis/config/validation/validation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func TestKMSEndpoint(t *testing.T) {
296296
desc: "invalid url",
297297
in: &config.KMSConfiguration{Endpoint: "unix:///foo\n.socket"},
298298
want: field.ErrorList{
299-
field.Invalid(endpointField, "unix:///foo\n.socket", "invalid endpoint for kms provider, error: parse unix:///foo\n.socket: net/url: invalid control character in URL"),
299+
field.Invalid(endpointField, "unix:///foo\n.socket", fmt.Sprintf(invalidURLErrFmt, `"unix:///foo\n.socket"`)),
300300
},
301301
},
302302
}

test/images/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images
1616
GOARM ?= 7
1717
DOCKER_CERT_BASE_PATH ?=
1818
QEMUVERSION=v2.9.1
19-
GOLANG_VERSION=1.13.9
19+
GOLANG_VERSION=1.14.4
2020
export
2121

2222
ifndef WHAT

test/images/sample-apiserver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
ARG BASEIMAGE
16-
FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.9-5 as build_k8s_1_17_sample_apiserver
16+
FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.14.4-2 as build_k8s_1_17_sample_apiserver
1717

1818
ENV GOPATH /go
1919
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin

0 commit comments

Comments
 (0)