Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

images: Update to go1.15.3 #1650

Merged
merged 5 commits into from
Oct 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies:

# Golang
- name: "golang"
version: 1.15.2
version: 1.15.3
refPaths:
- path: images/build/cross/Makefile
match: GO_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -70,8 +70,16 @@ dependencies:
- path: images/releng/ci/cloudbuild.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "k8s.gcr.io/go-runner"
version: buster-v2.1.0
refPaths:
- path: images/build/go-runner/Makefile
match: IMAGE_VERSION\ \?=\ [a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
- path: images/build/go-runner/variants.yaml
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)

- name: "k8s.gcr.io/kube-cross"
version: v1.15.2-1
version: v1.15.3-1
refPaths:
- path: images/build/cross/variants.yaml
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-\d+
Expand Down Expand Up @@ -142,11 +150,3 @@ dependencies:
refPaths:
- path: images/build/debian-hyperkube-base/Makefile
match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-iptables-\$\(ARCH\):[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)

- name: "k8s.gcr.io/go-runner"
version: buster-v2.0.2
refPaths:
- path: images/build/go-runner/Makefile
match: IMAGE_VERSION\ \?=\ [a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
- path: images/build/go-runner/variants.yaml
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
4 changes: 2 additions & 2 deletions images/build/cross/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
include $(CURDIR)/../../Makefile.common-image $(CURDIR)/../Makefile.build-image

IMGNAME = kube-cross
IMAGE_VERSION ?= v1.15.2-1
IMAGE_VERSION ?= v1.15.3-1
CONFIG ?= go1.15

# Build args
GO_VERSION?=1.15.2
GO_VERSION?=1.15.3
PROTOBUF_VERSION?=3.0.2
ETCD_VERSION?=v3.4.13

Expand Down
8 changes: 4 additions & 4 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
variants:
canary:
CONFIG: 'canary'
GO_VERSION: '1.15.2'
IMAGE_VERSION: 'v1.15.2-canary-1'
GO_VERSION: '1.15.3'
IMAGE_VERSION: 'v1.15.3-canary-1'
PROTOBUF_VERSION: '3.0.2'
ETCD_VERSION: 'v3.4.13'
go1.15:
CONFIG: 'go1.15'
GO_VERSION: '1.15.2'
IMAGE_VERSION: 'v1.15.2-1'
GO_VERSION: '1.15.3'
IMAGE_VERSION: 'v1.15.3-1'
PROTOBUF_VERSION: '3.0.2'
ETCD_VERSION: 'v3.4.13'
9 changes: 6 additions & 3 deletions images/build/go-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,17 @@
include $(CURDIR)/../../Makefile.common-image $(CURDIR)/../Makefile.build-image

IMGNAME = go-runner
IMAGE_VERSION ?= buster-v2.0.2
IMAGE_VERSION ?= buster-v2.1.0
CONFIG ?= buster

# Build args
GO_VERSION ?= 1.15.2
GO_VERSION ?= 1.15.3
DISTROLESS_IMAGE ?= static-debian10

PLATFORMS ?= linux/amd64 linux/arm64 linux/arm linux/ppc64le linux/s390x
# TODO: Re-enable linux/ppc64le builds once upstream distroless builds are fixed
# ref: https://github.com/GoogleContainerTools/distroless/pull/622
#PLATFORMS ?= linux/amd64 linux/arm64 linux/arm linux/ppc64le linux/s390x
PLATFORMS ?= linux/amd64 linux/arm64 linux/arm linux/s390x

HOST_GOOS ?= $(shell go env GOOS)
HOST_GOARCH ?= $(shell go env GOARCH)
Expand Down
4 changes: 2 additions & 2 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
variants:
buster:
CONFIG: 'buster'
IMAGE_VERSION: 'buster-v2.0.2'
GO_VERSION: '1.15.2'
IMAGE_VERSION: 'buster-v2.1.0'
GO_VERSION: '1.15.3'
DISTROLESS_IMAGE: 'static-debian10'
2 changes: 1 addition & 1 deletion images/releng/ci/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ substitutions:
# vYYYYMMDD-hash, and can be used as a substitution
_GIT_TAG: '12345'
_PULL_BASE_REF: 'dev'
_GO_VERSION: '1.15.2'
_GO_VERSION: '1.15.3'
images:
- 'gcr.io/$PROJECT_ID/releng-ci:${_GIT_TAG}'
- 'gcr.io/$PROJECT_ID/releng-ci:latest'
Expand Down