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

[go1.16] Build official images for go1.16.1 #1937

Merged
merged 5 commits into from
Mar 10, 2021
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
4 changes: 2 additions & 2 deletions cmd/vulndash/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ SHELL=/bin/bash -o pipefail

REGISTRY ?= gcr.io/k8s-staging-artifact-promoter
IMGNAME = vulndash
IMAGE_VERSION ?= v0.4.3-5
IMAGE_VERSION ?= v0.4.3-6
CONFIG ?= buster

IMAGE = $(REGISTRY)/$(IMGNAME)

TAG ?= $(shell git describe --tags --always --dirty)

# Build args
GO_VERSION ?= 1.16
GO_VERSION ?= 1.16.1
DISTROLESS_IMAGE ?= static-debian10

PLATFORMS ?= linux/amd64
Expand Down
4 changes: 2 additions & 2 deletions cmd/vulndash/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variants:
default:
IMAGE_VERSION: 'v0.4.3-5'
GO_VERSION: '1.16'
IMAGE_VERSION: 'v0.4.3-6'
GO_VERSION: '1.16.1'
DISTROLESS_IMAGE: 'static-debian10'
10 changes: 5 additions & 5 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.16
version: 1.16.1
refPaths:
- path: cmd/vulndash/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -98,21 +98,21 @@ dependencies:

# Golang images
- name: "gcr.io/k8s-staging-releng/releng-ci"
version: v0.4.0
version: v0.5.0
refPaths:
- path: images/releng/ci/cloudbuild.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/artifact-promoter/vulndash"
version: v0.4.3-5
version: v0.4.3-6
refPaths:
- path: cmd/vulndash/Makefile
match: IMAGE_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-([0-9]+)
- path: cmd/vulndash/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-]+)*))?)-([0-9]+)

- name: "k8s.gcr.io/build-image/go-runner"
version: v2.3.1-go1.16-buster.0
version: v2.3.1-go1.16.1-buster.0
refPaths:
- 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-]+)*))?)
Expand All @@ -126,7 +126,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross"
version: v1.16.0-1
version: v1.16.1-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
4 changes: 2 additions & 2 deletions images/build/cross/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ include $(CURDIR)/../Makefile.build-image
SHELL=/bin/bash -o pipefail

IMGNAME = kube-cross
IMAGE_VERSION ?= v1.16.0-1
IMAGE_VERSION ?= v1.16.1-1
CONFIG ?= go1.16
TYPE ?= default

# Build args
GO_VERSION?=1.16
GO_VERSION?=1.16.1
PROTOBUF_VERSION?=3.7.0
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
Expand Up @@ -2,15 +2,15 @@ variants:
canary:
TYPE: 'default'
CONFIG: 'canary'
GO_VERSION: '1.16'
IMAGE_VERSION: 'v1.16.0-canary-1'
GO_VERSION: '1.16.1'
IMAGE_VERSION: 'v1.16.1-canary-1'
PROTOBUF_VERSION: '3.7.0'
ETCD_VERSION: 'v3.4.13'
go1.16:
TYPE: 'default'
CONFIG: 'go1.16'
GO_VERSION: '1.16'
IMAGE_VERSION: 'v1.16.0-1'
GO_VERSION: '1.16.1'
IMAGE_VERSION: 'v1.16.1-1'
PROTOBUF_VERSION: '3.7.0'
ETCD_VERSION: 'v3.4.13'
go1.15:
Expand Down
2 changes: 1 addition & 1 deletion images/build/go-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OS_CODENAME ?= buster
REVISION ?= 0

# Build args
GO_VERSION ?= 1.16
GO_VERSION ?= 1.16.1
DISTROLESS_IMAGE ?= static-debian10

# Configuration
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,9 +1,9 @@
variants:
go1.16-buster:
CONFIG: 'go1.16-buster'
IMAGE_VERSION: 'v2.3.1-go1.16-buster.0'
IMAGE_VERSION: 'v2.3.1-go1.16.1-buster.0'
GO_MINOR_VERSION: '1.16'
OS_CODENAME: 'buster'
REVISION: '0'
GO_VERSION: '1.16'
GO_VERSION: '1.16.1'
DISTROLESS_IMAGE: 'static-debian10'
4 changes: 2 additions & 2 deletions images/releng/ci/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ substitutions:
# vYYYYMMDD-hash, and can be used as a substitution
_GIT_TAG: '12345'
_PULL_BASE_REF: 'dev'
_IMAGE_VERSION: 'v0.4.0'
_GO_VERSION: '1.16'
_IMAGE_VERSION: 'v0.5.0'
_GO_VERSION: '1.16.1'
images:
- 'gcr.io/$PROJECT_ID/releng-ci:${_GIT_TAG}'
- 'gcr.io/$PROJECT_ID/releng-ci:${_IMAGE_VERSION}'
Expand Down