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.

Sign up for GitHub

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

WIP: go-runner: switch to debian bookworm #3135

Closed
wants to merge 1 commit into from
Closed

WIP: go-runner: switch to debian bookworm #3135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,41 +151,41 @@ dependencies:
match: REVISION:\ '\d+'

# go-runner
- name: "registry.k8s.io/build-image/go-runner (go1.21-bullseye)"
version: v2.3.1-go1.21rc2-bullseye.0
- name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)"
version: v2.3.1-go1.21rc2-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-]+)*))?)

- name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bullseye)"
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bookworm)"
version: 0
refPaths:
- path: images/build/go-runner/Makefile
match: REVISION \?= \d+
- path: images/build/go-runner/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)"
version: v2.3.1-go1.20.5-bullseye.0
- name: "registry.k8s.io/build-image/go-runner (go1.20-bookworm)"
version: v2.3.1-go1.20.5-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-]+)*))?)

- name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bullseye)"
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bookworm)"
version: 0
refPaths:
- path: images/build/go-runner/Makefile
match: REVISION \?= \d+
- path: images/build/go-runner/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner (go1.19-bullseye)"
version: v2.3.1-go1.19.10-bullseye.0
- name: "registry.k8s.io/build-image/go-runner (go1.19-bookworm)"
version: v2.3.1-go1.19.10-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-]+)*))?)

- name: "registry.k8s.io/build-image/go-runner: image revision (go1.19-bullseye)"
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.19-bookworm)"
version: 0
refPaths:
- path: images/build/go-runner/Makefile
Expand Down Expand Up @@ -427,10 +427,11 @@ dependencies:
- path: images/build/debian-iptables/variants.yaml
match: "CONFIG: 'bullseye'"
# Must match distroless Debian version as well
- path: images/build/go-runner/Makefile
match: OS_CODENAME\ \?=\ bullseye
- path: images/build/go-runner/variants.yaml
match: "OS_CODENAME: 'bullseye'"
# TODO: revert once all images are on bookworm
# - path: images/build/go-runner/Makefile
# match: OS_CODENAME\ \?=\ bullseye
# - path: images/build/go-runner/variants.yaml
# match: "OS_CODENAME: 'bullseye'"
- path: images/build/setcap/Makefile
match: CONFIG\ \?=\ bullseye
- path: images/build/setcap/variants.yaml
Expand Down
4 changes: 2 additions & 2 deletions images/build/go-runner/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ APP_VERSION = $(shell cat VERSION)
GO_MAJOR_VERSION ?= 1.20
REVISION ?= 0
GO_VERSION ?= 1.20.5
OS_CODENAME ?= bullseye
OS_CODENAME ?= bookworm

# Build args
DISTROLESS_REGISTRY ?= gcr.io/distroless
DISTROLESS_IMAGE ?= static-debian11
DISTROLESS_IMAGE ?= static-debian12
BUILDER_IMAGE ?= golang:$(GO_VERSION)-$(OS_CODENAME)

# Configuration
Expand Down
30 changes: 15 additions & 15 deletions images/build/go-runner/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
variants:
go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.21rc2-bullseye.0'
go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.21rc2-bookworm.0'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.21rc2'
DISTROLESS_IMAGE: 'static-debian11'
go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.20.5-bullseye.0'
DISTROLESS_IMAGE: 'static-debian12'
go1.20-bookworm:
CONFIG: 'go1.20-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.20.5-bookworm.0'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.20.5'
DISTROLESS_IMAGE: 'static-debian11'
go1.19-bullseye:
CONFIG: 'go1.19-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.19.10-bullseye.0'
DISTROLESS_IMAGE: 'static-debian12'
go1.19-bookworm:
CONFIG: 'go1.19-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.19.10-bookworm.0'
GO_MAJOR_VERSION: '1.19'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.19.10'
DISTROLESS_IMAGE: 'static-debian11'
DISTROLESS_IMAGE: 'static-debian12'