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

Build Go 1.21.4 and 1.20.11 images #3348

Merged
merged 2 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

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

# Golang
- name: "golang"
version: 1.21.3
version: 1.21.4
refPaths:
- path: images/build/cross/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -114,7 +114,7 @@ dependencies:

# go-runner
- name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)"
version: v2.3.1-go1.21.3-bookworm.0
version: v2.3.1-go1.21.4-bookworm.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 @@ -128,7 +128,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)"
version: v2.3.1-go1.20.10-bullseye.0
version: v2.3.1-go1.20.11-bullseye.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 @@ -151,7 +151,7 @@ dependencies:

# kube-cross
- name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.21)"
version: v1.29.0-go1.21.3-bullseye.0
version: v1.29.0-go1.21.4-bullseye.0
refPaths:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"
Expand All @@ -171,7 +171,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.20)"
version: v1.28.0-go1.20.10-bullseye.0
version: v1.28.0-go1.20.11-bullseye.0
refPaths:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"
Expand All @@ -191,7 +191,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)"
version: v1.27.0-go1.20.10-bullseye.0
version: v1.27.0-go1.20.11-bullseye.0
refPaths:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"
Expand All @@ -211,7 +211,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.20)"
version: v1.26.0-go1.20.10-bullseye.0
version: v1.26.0-go1.20.11-bullseye.0
refPaths:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"
Expand All @@ -231,7 +231,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.25-go1.20)"
version: v1.25.0-go1.20.10-bullseye.0
version: v1.25.0-go1.20.11-bullseye.0
cpanato marked this conversation as resolved.
Show resolved Hide resolved
refPaths:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"
Expand Down Expand Up @@ -314,7 +314,7 @@ dependencies:

# Golang (previous release branches: 1.28)
- name: "golang (previous release branches: 1.28)"
version: 1.20.10
version: 1.20.11
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -337,7 +337,7 @@ dependencies:

# Golang (previous release branches: 1.27)
- name: "golang (previous release branches: 1.27)"
version: 1.20.10
version: 1.20.11
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -354,7 +354,7 @@ dependencies:

# Golang (previous release branches: 1.26)
- name: "golang (previous release branches: 1.26)"
version: 1.20.10
version: 1.20.11
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -371,7 +371,7 @@ dependencies:

# Golang (previous release branches: 1.25)
- name: "golang (previous release branches: 1.25)"
version: 1.20.10
version: 1.20.11
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
2 changes: 1 addition & 1 deletion images/build/cross/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ IMGNAME = kube-cross
# - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
# - v1.100-go1.17-bullseye.0 does not
KUBERNETES_VERSION ?= v1.29.0
GO_VERSION ?= 1.21.3
GO_VERSION ?= 1.21.4
GO_MAJOR_VERSION ?= 1.21
OS_CODENAME ?= bullseye
REVISION ?= 0
Expand Down
20 changes: 10 additions & 10 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,45 @@ variants:
v1.29-go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.29.0-go1.21.3-bullseye.0'
IMAGE_VERSION: 'v1.29.0-go1.21.4-bullseye.0'
KUBERNETES_VERSION: 'v1.29.0'
GO_VERSION: '1.21.3'
GO_VERSION: '1.21.4'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.28-go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.28.0-go1.20.10-bullseye.0'
IMAGE_VERSION: 'v1.28.0-go1.20.11-bullseye.0'
KUBERNETES_VERSION: 'v1.28.0'
GO_VERSION: '1.20.10'
GO_VERSION: '1.20.11'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.27-go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.27.0-go1.20.10-bullseye.0'
IMAGE_VERSION: 'v1.27.0-go1.20.11-bullseye.0'
KUBERNETES_VERSION: 'v1.27.0'
GO_VERSION: '1.20.10'
GO_VERSION: '1.20.11'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.26-go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.26.0-go1.20.10-bullseye.0'
IMAGE_VERSION: 'v1.26.0-go1.20.11-bullseye.0'
KUBERNETES_VERSION: 'v1.26.0'
GO_VERSION: '1.20.10'
GO_VERSION: '1.20.11'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.25-go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.25.0-go1.20.10-bullseye.0'
IMAGE_VERSION: 'v1.25.0-go1.20.11-bullseye.0'
KUBERNETES_VERSION: 'v1.25.0'
GO_VERSION: '1.20.10'
GO_VERSION: '1.20.11'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
REVISION: '0'
2 changes: 1 addition & 1 deletion images/build/go-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ IMGNAME = go-runner
APP_VERSION = $(shell cat VERSION)
GO_MAJOR_VERSION ?= 1.21
REVISION ?= 0
GO_VERSION ?= 1.21.3
GO_VERSION ?= 1.21.4
OS_CODENAME ?= bookworm

# Build args
Expand Down
8 changes: 4 additions & 4 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
variants:
go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.21.3-bookworm.0'
IMAGE_VERSION: 'v2.3.1-go1.21.4-bookworm.0'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.21.3'
GO_VERSION: '1.21.4'
DISTROLESS_IMAGE: 'static-debian12'
go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.20.10-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.20.11-bullseye.0'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.20.10'
GO_VERSION: '1.20.11'
DISTROLESS_IMAGE: 'static-debian11'
4 changes: 2 additions & 2 deletions images/releng/ci/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
variants:
go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
GO_VERSION: '1.21.3'
GO_VERSION: '1.21.4'
OS_CODENAME: 'bookworm'
REVISION: '0'
go1.20-bookworm:
CONFIG: 'go1.20-bookworm'
GO_VERSION: '1.20.10'
GO_VERSION: '1.20.11'
OS_CODENAME: 'bookworm'
REVISION: '0'