mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Merge pull request #93088 from justaugustus/go1145
Update Golang to v1.14.5
This commit is contained in:
commit
afecf524dd
@ -1 +1 @@
|
|||||||
v1.14.4-2
|
v1.14.5-1
|
||||||
|
@ -68,7 +68,7 @@ dependencies:
|
|||||||
- path: cluster/images/etcd/migrate/options.go
|
- path: cluster/images/etcd/migrate/options.go
|
||||||
|
|
||||||
- name: "golang"
|
- name: "golang"
|
||||||
version: 1.14.4
|
version: 1.14.5
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
- path: build/root/WORKSPACE
|
- path: build/root/WORKSPACE
|
||||||
@ -133,7 +133,7 @@ dependencies:
|
|||||||
match: tag =
|
match: tag =
|
||||||
|
|
||||||
- name: "k8s.gcr.io/kube-cross: dependents"
|
- name: "k8s.gcr.io/kube-cross: dependents"
|
||||||
version: v1.14.4-2
|
version: v1.14.5-1
|
||||||
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
|
||||||
@ -198,7 +198,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.6
|
version: 0.0.7
|
||||||
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 = "7da9e67cd291e2b3b0503649d1beaf82b10c2483f4061ebe05fb7d19f62442f0",
|
sha256 = "54036881c2d1e55f76969777298e1c4a3cf44ba6c67fbba948c2bbeba91f19fe",
|
||||||
strip_prefix = "repo-infra-0.0.6",
|
strip_prefix = "repo-infra-0.0.7",
|
||||||
urls = [
|
urls = [
|
||||||
"https://github.com/kubernetes/repo-infra/archive/v0.0.6.tar.gz",
|
"https://github.com/kubernetes/repo-infra/archive/v0.0.7.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.14.4",
|
go_version = "1.14.5",
|
||||||
minimum_bazel_version = "2.2.0",
|
minimum_bazel_version = "2.2.0",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -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.14.4
|
GOLANG_VERSION=1.14.5
|
||||||
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.14.4-2 as build_k8s_1_17_sample_apiserver
|
FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.14.5-1 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