Skip to content
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
38 changes: 36 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,20 @@ 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
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)"
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
refPaths:
Expand Down Expand Up @@ -180,6 +194,26 @@ dependencies:
match: REVISION:\ '\d+'

# kube-cross
- name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.21)"
version: v1.28.0-go1.21rc2-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-]+)*))?)'"

- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.28-go1.21)"
version: go1.21-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

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

- name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)"
version: v1.27.0-go1.20.5-bullseye.0
refPaths:
Expand Down Expand Up @@ -286,7 +320,7 @@ dependencies:

# Golang (next candidate)
- name: "golang (next candidate)"
version: 1.20
version: 1.21rc2
refPaths:
- path: images/build/cross/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
Expand All @@ -305,7 +339,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross: config variant (next candidate)"
version: go1.20-bullseye
version: go1.21-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
Expand Down
10 changes: 10 additions & 0 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
variants:
v1.28-go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.28.0-go1.21rc2-bullseye.0'
KUBERNETES_VERSION: 'v1.28.0'
GO_VERSION: '1.21rc2'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
v1.27-go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
TYPE: 'default'
Expand Down
8 changes: 8 additions & 0 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
variants:
go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.21rc2-bullseye.0'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
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'
Expand Down
5 changes: 5 additions & 0 deletions images/releng/ci/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
variants:
go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
GO_VERSION: '1.21rc2'
OS_CODENAME: 'bullseye'
REVISION: '0'
go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
GO_VERSION: '1.20.5'
Expand Down
6 changes: 5 additions & 1 deletion images/releng/k8s-ci-builder/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ variants:
OS_CODENAME: 'bullseye'
next:
CONFIG: next
GO_VERSION: '1.20.5'
GO_VERSION: '1.21rc2'
OS_CODENAME: 'bullseye'
'1.28':
CONFIG: '1.28'
GO_VERSION: '1.21rc2'
OS_CODENAME: 'bullseye'
'1.27':
CONFIG: '1.27'
Expand Down