diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index e8733feda3d..2ce8310358f 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.15.0-rc.1-1 +v1.15.0-rc.2-1 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 51fb5591186..815590c2e0f 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -83,20 +83,20 @@ dependencies: # Golang - name: "golang" - version: 1.15.0-rc.1 + version: 1.15.0-rc.2 refPaths: - path: build/build-image/cross/VERSION - path: build/root/WORKSPACE match: (override_)?go_version = "((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)" - name: "golang: upstream container image" - version: 1.15rc1 + version: 1.15rc2 refPaths: - path: test/images/Makefile - match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)\d+ + match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+ - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.15.0-rc.1-1 + version: v1.15.0-rc.2-1 refPaths: - path: build/build-image/cross/VERSION - path: test/images/sample-apiserver/Dockerfile diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 57f9b13c7e3..cad678de818 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -27,7 +27,7 @@ repo_infra_configure( # TODO(go1.15): Uncomment once we've published a repo-infra release that supports go1.15 #go_version = "1.15.0", # TODO(go1.15): Comment out once we've published a repo-infra release that supports go1.15 - override_go_version = "1.15.0-rc.1", + override_go_version = "1.15.0-rc.2", minimum_bazel_version = "2.2.0", ) diff --git a/test/images/Makefile b/test/images/Makefile index dc72465a861..61414d1d7ec 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v2.9.1 -GOLANG_VERSION=1.15rc1 +GOLANG_VERSION=1.15rc2 export ifndef WHAT diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile index 613be76e231..9724e0ba8ba 100644 --- a/test/images/sample-apiserver/Dockerfile +++ b/test/images/sample-apiserver/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG BASEIMAGE -FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-rc.1-1 as build_k8s_1_17_sample_apiserver +FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-rc.2-1 as build_k8s_1_17_sample_apiserver ENV GOPATH /go RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin