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

releng/k8s-ci-builder base image: update to bookworm #3430

Closed
wants to merge 2 commits into from
Closed

releng/k8s-ci-builder base image: update to bookworm #3430

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29f3455
base image: update to bookworm
pacoxu Jan 24, 2024
2f70daa
comment ulimit -Hn in wrapper.sh
pacoxu Jan 24, 2024
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
6 changes: 2 additions & 4 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,6 @@ dependencies:
# We keep them around for backwards compatibility and release branches.
- path: images/build/go-runner/variants.yaml
match: "OS_CODENAME: 'bullseye'"
- path: images/releng/k8s-ci-builder/Makefile
match: OS_CODENAME\ \?=\ bullseye
- path: images/releng/k8s-ci-builder/variants.yaml
match: "OS_CODENAME: 'bullseye'"

- name: "Debian: codename (default)"
version: bookworm
Expand All @@ -458,6 +454,8 @@ dependencies:
match: "OS_CODENAME: 'bookworm'"
- path: images/releng/k8s-ci-builder/variants.yaml
match: "OS_CODENAME: 'bookworm'"
Copy link
Member Author

@pacoxu pacoxu Jan 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have this, so just remove line 439-440.

- path: images/releng/k8s-ci-builder/Makefile
match: OS_CODENAME\ \?=\ bookworm

- name: "registry.k8s.io/build-image/debian-base"
version: bookworm-v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ TAG ?= $(shell git describe --tags --always --dirty)

# Build args
GO_VERSION ?= 1.21.6
OS_CODENAME ?= bullseye
OS_CODENAME ?= bookworm
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

BUILD_ARGS = --build-arg=GO_VERSION=$(GO_VERSION) \
Expand Down
12 changes: 6 additions & 6 deletions images/releng/k8s-ci-builder/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ variants:
default:
CONFIG: default
GO_VERSION: '1.21.6'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
next:
CONFIG: next
GO_VERSION: '1.22rc1'
OS_CODENAME: 'bookworm'
'1.30':
CONFIG: '1.30'
GO_VERSION: '1.22rc1'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
'1.29':
CONFIG: '1.29'
GO_VERSION: '1.21.6'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
'1.28':
CONFIG: '1.28'
GO_VERSION: '1.20.13'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change this as https://testgrid.k8s.io/sig-release-1.28-blocking#build-1.28 started to fail as well.

'1.27':
CONFIG: '1.27'
GO_VERSION: '1.20.13'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
'1.26':
CONFIG: '1.26'
GO_VERSION: '1.20.13'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
Loading