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
50 changes: 12 additions & 38 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
# Golang (for images, latest)
# To be updated before kubernetes/kubernetes update
- name: "golang (latest)"
version: 1.25.4
version: 1.25.5
refPaths:
- path: images/build/cross/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -41,19 +41,7 @@ dependencies:
# Golang (for images, previous stable)
# To be updated before kubernetes/kubernetes update
- name: "golang (previous)"
version: 1.24.10
refPaths:
- path: images/build/cross/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
- path: images/build/go-runner/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
- path: images/releng/ci/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

# Golang (for images, previous stable)
# To be updated before kubernetes/kubernetes update
- name: "golang (previous)"
version: 1.23.12
version: 1.24.11
refPaths:
- path: images/build/cross/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
Expand Down Expand Up @@ -156,7 +144,7 @@ dependencies:
- path: images/build/go-runner/VERSION

- name: "registry.k8s.io/build-image/go-runner (go1.25-bookworm)"
version: v2.4.0-go1.25.4-bookworm.0
version: v2.4.0-go1.25.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-]+)*))?)
Expand All @@ -170,7 +158,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner (go1.24-bookworm)"
version: v2.4.0-go1.24.10-bookworm.0
version: v2.4.0-go1.24.11-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 @@ -185,13 +173,13 @@ dependencies:

# go-runner (latest Golang)
# To be updated before kubernetes/kubernetes update
- name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)"
version: v2.4.0-go1.24.10-bookworm.0
- name: "registry.k8s.io/build-image/go-runner (go1.24-bookworm)"
version: v2.4.0-go1.24.11-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.23-bookworm)"
- name: "registry.k8s.io/build-image/go-runner: image revision (go1.24-bookworm)"
version: 0
refPaths:
- path: images/build/go-runner/Makefile
Expand All @@ -207,7 +195,7 @@ dependencies:
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

- name: "registry.k8s.io/build-image/kube-cross (v1.34-go1.24)"
version: v1.35.0-go1.25.4-bullseye.0
version: v1.35.0-go1.25.5-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 @@ -228,7 +216,7 @@ dependencies:
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

- name: "registry.k8s.io/build-image/kube-cross (v1.34-go1.24)"
version: v1.34.0-go1.24.10-bullseye.0
version: v1.34.0-go1.24.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 @@ -244,7 +232,7 @@ dependencies:
# kube-cross (Kubernetes v1.33)
# To be updated before kubernetes/kubernetes update
- name: "registry.k8s.io/build-image/kube-cross (v1.33-go1.24)"
version: v1.33.0-go1.24.10-bullseye.0
version: v1.33.0-go1.24.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 @@ -265,26 +253,12 @@ dependencies:

# kube-cross (Kubernetes v1.32)
# To be updated before kubernetes/kubernetes update
- name: "registry.k8s.io/build-image/kube-cross (v1.32-go1.23)"
version: v1.32.0-go1.24.10-bullseye.0
- name: "registry.k8s.io/build-image/kube-cross (v1.32-go1.24)"
version: v1.32.0-go1.24.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-]+)*))?)'"

- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.32-go1.23)"
version: go1.23-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.32-go1.23)"
version: 0
refPaths:
- path: images/build/cross/Makefile
match: REVISION \?= \d+
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

# kube-cross dependents (i.e. k8s-cloud-builder)
# To be updated after kubernetes/kubernetes update)
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.35-cross1.25)"
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.35.0
GO_VERSION ?= 1.25.4
GO_VERSION ?= 1.25.5
GO_MAJOR_VERSION ?= 1.25
OS_CODENAME ?= bullseye
REVISION ?= 0
Expand Down
25 changes: 8 additions & 17 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,36 @@ variants:
v1.35-go1.25-bullseye:
CONFIG: 'go1.25-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.35.0-go1.25.4-bullseye.0'
IMAGE_VERSION: 'v1.35.0-go1.25.5-bullseye.0'
KUBERNETES_VERSION: 'v1.35.0'
GO_VERSION: '1.25.4'
GO_VERSION: '1.25.5'
GO_MAJOR_VERSION: '1.25'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.34-go1.24-bullseye:
CONFIG: 'go1.24-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.34.0-go1.24.10-bullseye.0'
IMAGE_VERSION: 'v1.34.0-go1.24.11-bullseye.0'
KUBERNETES_VERSION: 'v1.34.0'
GO_VERSION: '1.24.10'
GO_VERSION: '1.24.11'
GO_MAJOR_VERSION: '1.24'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.33-go1.24-bullseye:
CONFIG: 'go1.24-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.33.0-go1.24.10-bullseye.0'
IMAGE_VERSION: 'v1.33.0-go1.24.11-bullseye.0'
KUBERNETES_VERSION: 'v1.33.0'
GO_VERSION: '1.24.10'
GO_VERSION: '1.24.11'
GO_MAJOR_VERSION: '1.24'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.32-go1.24-bullseye:
CONFIG: 'go1.24-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.32.0-go1.24.10-bullseye.0'
IMAGE_VERSION: 'v1.32.0-go1.24.11-bullseye.0'
KUBERNETES_VERSION: 'v1.32.0'
GO_VERSION: '1.24.10'
GO_VERSION: '1.24.11'
GO_MAJOR_VERSION: '1.24'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.32-go1.23-bullseye:
CONFIG: 'go1.23-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.32.0-go1.23.12-bullseye.0'
KUBERNETES_VERSION: 'v1.32.0'
GO_VERSION: '1.23.12'
GO_MAJOR_VERSION: '1.23'
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.25
REVISION ?= 0
GO_VERSION ?= 1.25.4
GO_VERSION ?= 1.25.5
OS_CODENAME ?= bookworm-slim

# Build args
Expand Down
16 changes: 4 additions & 12 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
variants:
go1.25-bookworm:
CONFIG: 'go1.25-bookworm'
IMAGE_VERSION: 'v2.4.0-go1.25.4-bookworm.0'
IMAGE_VERSION: 'v2.4.0-go1.25.5-bookworm.0'
GO_MAJOR_VERSION: '1.25'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.25.4'
GO_VERSION: '1.25.5'
DISTROLESS_IMAGE: 'static-debian12'
go1.24-bookworm:
CONFIG: 'go1.24-bookworm'
IMAGE_VERSION: 'v2.4.0-go1.24.10-bookworm.0'
IMAGE_VERSION: 'v2.4.0-go1.24.11-bookworm.0'
GO_MAJOR_VERSION: '1.24'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.24.10'
DISTROLESS_IMAGE: 'static-debian12'
go1.23-bookworm:
CONFIG: 'go1.23-bookworm'
IMAGE_VERSION: 'v2.4.0-go1.23.12-bookworm.0'
GO_MAJOR_VERSION: '1.23'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.23.12'
GO_VERSION: '1.24.11'
DISTROLESS_IMAGE: 'static-debian12'
9 changes: 2 additions & 7 deletions images/releng/ci/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
variants:
go1.25-trixie:
CONFIG: 'go1.25-trixie'
GO_VERSION: '1.25.4'
GO_VERSION: '1.25.5'
OS_CODENAME: 'trixie'
REVISION: '0'
go1.24-bookworm:
CONFIG: 'go1.24-bookworm'
GO_VERSION: '1.24.10'
OS_CODENAME: 'bookworm'
REVISION: '0'
go1.23-bookworm:
CONFIG: 'go1.23-bookworm'
GO_VERSION: '1.23.12'
GO_VERSION: '1.24.11'
OS_CODENAME: 'bookworm'
REVISION: '0'