github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 13:50:01 +00:00
Code Issues Projects Releases Wiki Activity

[go1.15] dependencies.yaml: Update to go1.15rc1

Browse Source 
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
This commit is contained in:
Stephen Augustus
2020-07-20 15:53:39 -04:00
parent ed5a62f220
commit 479249b3a3
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/VERSION
View File

@@ -1 +1 @@
v1.14.6-1 v1.15.0-rc.1-1

14
build/dependencies.yaml
View File

@@ -83,20 +83,24 @@ dependencies:
# Golang # Golang
- name: "golang" - name: "golang"
version: 1.14.6 version: 1.15.0-rc.1
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
- path: build/root/WORKSPACE - path: build/root/WORKSPACE
match: go_version = "\d+\.\d+\.\d+" 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
refPaths:
- path: test/images/Makefile - path: test/images/Makefile
match: GOLANG_VERSION match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)\d+
- name: "k8s.gcr.io/kube-cross: dependents" - name: "k8s.gcr.io/kube-cross: dependents"
version: v1.14.6-1 version: v1.15.0-rc.1-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
match: k8s\.gcr\.io\/build-image\/kube-cross:v\d+\.\d+\.\d+-\d+ match: k8s\.gcr\.io\/build-image\/kube-cross:v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
# Base images # Base images
- name: "k8s.gcr.io/debian-base" - name: "k8s.gcr.io/debian-base"

9
build/root/WORKSPACE
View File

@@ -19,8 +19,15 @@ 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")
# IMPORTANT: Only one go version may be specified at a time
# 'go_version': used to specify a published upstream go version
# 'override_go_version': used to specify an alternate go version provided
# by kubernetes/repo-infra
repo_infra_configure( repo_infra_configure(
go_version = "1.14.6", # 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",
minimum_bazel_version = "2.2.0", minimum_bazel_version = "2.2.0",
) )

2
test/images/Makefile
View File

@@ -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.6 GOLANG_VERSION=1.15rc1
export export
ifndef WHAT ifndef WHAT

2
test/images/sample-apiserver/Dockerfile
View File

@@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
ARG BASEIMAGE ARG BASEIMAGE
FROM k8s.gcr.io/build-image/kube-cross:v1.14.6-1 as build_k8s_1_17_sample_apiserver FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-rc.1-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