mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 10:20:51 +00:00
Merge pull request #88638 from justaugustus/go1140
Update Golang to v1.14.4
This commit is contained in:
commit
f2534f2c20
@ -1 +1 @@
|
|||||||
v1.13.9-5
|
v1.14.4-2
|
||||||
|
@ -69,9 +69,11 @@ dependencies:
|
|||||||
match: BUNDLED_VERSIONS=
|
match: BUNDLED_VERSIONS=
|
||||||
|
|
||||||
- name: "golang"
|
- name: "golang"
|
||||||
version: 1.13.9
|
version: 1.14.4
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
|
- path: build/root/WORKSPACE
|
||||||
|
match: go_version = "\d+\.\d+\.\d+"
|
||||||
- path: test/images/Makefile
|
- path: test/images/Makefile
|
||||||
match: GOLANG_VERSION
|
match: GOLANG_VERSION
|
||||||
|
|
||||||
@ -132,7 +134,7 @@ dependencies:
|
|||||||
match: tag =
|
match: tag =
|
||||||
|
|
||||||
- name: "k8s.gcr.io/kube-cross: dependents"
|
- name: "k8s.gcr.io/kube-cross: dependents"
|
||||||
version: v1.13.9-5
|
version: v1.14.4-2
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
- path: test/images/sample-apiserver/Dockerfile
|
- path: test/images/sample-apiserver/Dockerfile
|
||||||
@ -197,7 +199,7 @@ dependencies:
|
|||||||
match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+"}
|
match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+"}
|
||||||
|
|
||||||
- name: "repo-infra"
|
- name: "repo-infra"
|
||||||
version: 0.0.5
|
version: 0.0.6
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/root/WORKSPACE
|
- path: build/root/WORKSPACE
|
||||||
match: strip_prefix = "repo-infra-\d+.\d+.\d+"
|
match: strip_prefix = "repo-infra-\d+.\d+.\d+"
|
||||||
|
@ -5,10 +5,10 @@ load("//build:workspace_mirror.bzl", "mirror")
|
|||||||
|
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "io_k8s_repo_infra",
|
name = "io_k8s_repo_infra",
|
||||||
sha256 = "55e56b332ead9c32e1d53c9834a5c918a4cecd6859b70645eba6cd10372fd68f",
|
sha256 = "7da9e67cd291e2b3b0503649d1beaf82b10c2483f4061ebe05fb7d19f62442f0",
|
||||||
strip_prefix = "repo-infra-0.0.5",
|
strip_prefix = "repo-infra-0.0.6",
|
||||||
urls = [
|
urls = [
|
||||||
"https://github.com/kubernetes/repo-infra/archive/v0.0.5.tar.gz",
|
"https://github.com/kubernetes/repo-infra/archive/v0.0.6.tar.gz",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ repo_infra_repositories()
|
|||||||
load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_infra_go_repositories = "go_repositories")
|
load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_infra_go_repositories = "go_repositories")
|
||||||
|
|
||||||
repo_infra_configure(
|
repo_infra_configure(
|
||||||
go_version = "1.13.9",
|
go_version = "1.14.4",
|
||||||
minimum_bazel_version = "2.2.0",
|
minimum_bazel_version = "2.2.0",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@ const (
|
|||||||
keyLenErrFmt = "secret is not of the expected length, got %d, expected one of %v"
|
keyLenErrFmt = "secret is not of the expected length, got %d, expected one of %v"
|
||||||
unsupportedSchemeErrFmt = "unsupported scheme %q for KMS provider, only unix is supported"
|
unsupportedSchemeErrFmt = "unsupported scheme %q for KMS provider, only unix is supported"
|
||||||
atLeastOneRequiredErrFmt = "at least one %s is required"
|
atLeastOneRequiredErrFmt = "at least one %s is required"
|
||||||
|
invalidURLErrFmt = "invalid endpoint for kms provider, error: parse %s: net/url: invalid control character in URL"
|
||||||
mandatoryFieldErrFmt = "%s is a mandatory field for a %s"
|
mandatoryFieldErrFmt = "%s is a mandatory field for a %s"
|
||||||
base64EncodingErr = "secrets must be base64 encoded"
|
base64EncodingErr = "secrets must be base64 encoded"
|
||||||
zeroOrNegativeErrFmt = "%s should be a positive value"
|
zeroOrNegativeErrFmt = "%s should be a positive value"
|
||||||
|
@ -296,7 +296,7 @@ func TestKMSEndpoint(t *testing.T) {
|
|||||||
desc: "invalid url",
|
desc: "invalid url",
|
||||||
in: &config.KMSConfiguration{Endpoint: "unix:///foo\n.socket"},
|
in: &config.KMSConfiguration{Endpoint: "unix:///foo\n.socket"},
|
||||||
want: field.ErrorList{
|
want: field.ErrorList{
|
||||||
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"),
|
field.Invalid(endpointField, "unix:///foo\n.socket", fmt.Sprintf(invalidURLErrFmt, `"unix:///foo\n.socket"`)),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images
|
|||||||
GOARM ?= 7
|
GOARM ?= 7
|
||||||
DOCKER_CERT_BASE_PATH ?=
|
DOCKER_CERT_BASE_PATH ?=
|
||||||
QEMUVERSION=v2.9.1
|
QEMUVERSION=v2.9.1
|
||||||
GOLANG_VERSION=1.13.9
|
GOLANG_VERSION=1.14.4
|
||||||
export
|
export
|
||||||
|
|
||||||
ifndef WHAT
|
ifndef WHAT
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
ARG BASEIMAGE
|
ARG BASEIMAGE
|
||||||
FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.9-5 as build_k8s_1_17_sample_apiserver
|
FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.14.4-2 as build_k8s_1_17_sample_apiserver
|
||||||
|
|
||||||
ENV GOPATH /go
|
ENV GOPATH /go
|
||||||
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
|
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
|
||||||
|
Loading…
Reference in New Issue
Block a user