Skip to content

Commit aa2bb18

Browse files
committed
[go1.15] Update to go1.15
Signed-off-by: Stephen Augustus <[email protected]>
1 parent 5d1e299 commit aa2bb18

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
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.15.0-rc.2-1
1+
v1.15.0-1

build/dependencies.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,17 @@ dependencies:
8282
- path: cluster/images/etcd/migrate/options.go
8383

8484
# Golang
85-
- name: "golang"
86-
version: 1.15.0-rc.2
85+
- name: "golang: upstream version"
86+
version: 1.15
8787
refPaths:
8888
- path: build/build-image/cross/VERSION
8989
- path: build/root/WORKSPACE
90-
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-]+)*))?)"
91-
92-
- name: "golang: upstream container image"
93-
version: 1.15rc2
94-
refPaths:
90+
match: (override_)?go_version = "\d+.\d+(alpha|beta|rc)?\.?\d+"
9591
- path: test/images/Makefile
9692
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
9793

9894
- name: "k8s.gcr.io/kube-cross: dependents"
99-
version: v1.15.0-rc.2-1
95+
version: v1.15.0-1
10096
refPaths:
10197
- path: build/build-image/cross/VERSION
10298
- path: test/images/sample-apiserver/Dockerfile

build/root/WORKSPACE

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_
2323
# 'override_go_version': used to specify an alternate go version provided
2424
# by kubernetes/repo-infra
2525
repo_infra_configure(
26-
# TODO(go1.15): Uncomment once we've published a repo-infra release that supports go1.15
27-
#go_version = "1.15.0",
28-
# TODO(go1.15): Comment out once we've published a repo-infra release that supports go1.15
29-
override_go_version = "1.15.0-rc.2",
26+
go_version = "1.15",
3027
minimum_bazel_version = "2.2.0",
3128
)
3229

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.15rc2
19+
GOLANG_VERSION=1.15.0
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 k8s.gcr.io/build-image/kube-cross:v1.15.0-rc.2-1 as build_k8s_1_17_sample_apiserver
16+
FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-1 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)