File tree Expand file tree Collapse file tree 3 files changed +9
-11
lines changed
images/releng/k8s-ci-builder Expand file tree Collapse file tree 3 files changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -436,10 +436,6 @@ dependencies:
436436 # We keep them around for backwards compatibility and release branches.
437437 - path : images/build/go-runner/variants.yaml
438438 match : " OS_CODENAME: 'bullseye'"
439- - path : images/releng/k8s-ci-builder/Makefile
440- match : OS_CODENAME\ \?=\ bullseye
441- - path : images/releng/k8s-ci-builder/variants.yaml
442- match : " OS_CODENAME: 'bullseye'"
443439
444440 - name : " Debian: codename (default)"
445441 version : bookworm
@@ -458,6 +454,8 @@ dependencies:
458454 match : " OS_CODENAME: 'bookworm'"
459455 - path : images/releng/k8s-ci-builder/variants.yaml
460456 match : " OS_CODENAME: 'bookworm'"
457+ - path : images/releng/k8s-ci-builder/Makefile
458+ match : OS_CODENAME\ \?=\ bookworm
461459
462460 - name : " registry.k8s.io/build-image/debian-base"
463461 version : bookworm-v1.0.0
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ TAG ?= $(shell git describe --tags --always --dirty)
2525
2626# Build args
2727GO_VERSION ?= 1.21.6
28- OS_CODENAME ?= bullseye
28+ OS_CODENAME ?= bookworm
2929IMAGE_ARG ?= $(IMAGE ) :$(TAG ) -$(CONFIG )
3030
3131BUILD_ARGS = --build-arg=GO_VERSION=$(GO_VERSION ) \
Original file line number Diff line number Diff line change @@ -2,28 +2,28 @@ variants:
22 default :
33 CONFIG : default
44 GO_VERSION : ' 1.21.6'
5- OS_CODENAME : ' bullseye '
5+ OS_CODENAME : ' bookworm '
66 next :
77 CONFIG : next
88 GO_VERSION : ' 1.22rc1'
99 OS_CODENAME : ' bookworm'
1010 ' 1.30 ' :
1111 CONFIG : ' 1.30'
1212 GO_VERSION : ' 1.22rc1'
13- OS_CODENAME : ' bullseye '
13+ OS_CODENAME : ' bookworm '
1414 ' 1.29 ' :
1515 CONFIG : ' 1.29'
1616 GO_VERSION : ' 1.21.6'
17- OS_CODENAME : ' bullseye '
17+ OS_CODENAME : ' bookworm '
1818 ' 1.28 ' :
1919 CONFIG : ' 1.28'
2020 GO_VERSION : ' 1.20.13'
21- OS_CODENAME : ' bullseye '
21+ OS_CODENAME : ' bookworm '
2222 ' 1.27 ' :
2323 CONFIG : ' 1.27'
2424 GO_VERSION : ' 1.20.13'
25- OS_CODENAME : ' bullseye '
25+ OS_CODENAME : ' bookworm '
2626 ' 1.26 ' :
2727 CONFIG : ' 1.26'
2828 GO_VERSION : ' 1.20.13'
29- OS_CODENAME : ' bullseye '
29+ OS_CODENAME : ' bookworm '
You can’t perform that action at this time.
0 commit comments