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
24 changes: 12 additions & 12 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -262,25 +262,25 @@ dependencies:
# 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)"
version: v1.35.0-go1.25.4-bullseye.0
version: v1.35.0-go1.25.5-bullseye.0
refPaths:
- path: images/k8s-cloud-builder/variants.yaml
match: "KUBE_CROSS_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: dependents k8s-cloud-builder (v1.34-cross1.24)"
version: v1.34.0-go1.24.10-bullseye.0
version: v1.34.0-go1.24.11-bullseye.0
refPaths:
- path: images/k8s-cloud-builder/variants.yaml
match: "KUBE_CROSS_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: dependents k8s-cloud-builder (v1.33-cross1.24)"
version: v1.33.0-go1.24.10-bullseye.0
version: v1.33.0-go1.24.11-bullseye.0
refPaths:
- path: images/k8s-cloud-builder/variants.yaml
match: "KUBE_CROSS_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: dependents k8s-cloud-builder (v1.32-cross1.24)"
version: v1.32.0-go1.24.10-bullseye.0
version: v1.32.0-go1.24.11-bullseye.0
refPaths:
- path: images/k8s-cloud-builder/variants.yaml
match: "KUBE_CROSS_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 @@ -294,7 +294,7 @@ dependencies:

# Golang (current release branch: master)
- name: "golang: after kubernetes/kubernetes update (master)"
version: 1.25.4
version: 1.25.5
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -303,48 +303,48 @@ dependencies:

# Golang (previous release branch: 1.34)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.34)"
version: 1.24.10
version: 1.24.11
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branch: 1.33)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.33)"
version: 1.24.10
version: 1.24.11
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branch: 1.32)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.32)"
version: 1.24.10
version: 1.24.11
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# k8s-ci-builder
- name: "golang: releng tooling for k8s-ci-builder (master)"
version: 1.25.4
version: 1.25.5
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.34)"
version: 1.24.10
version: 1.24.11
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.33)"
version: 1.24.10
version: 1.24.11
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

- name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.32)"
version: 1.24.10
version: 1.24.11
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
Expand Down
8 changes: 4 additions & 4 deletions images/k8s-cloud-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
variants:
v1.35-cross1.25-bullseye:
CONFIG: 'cross1.25'
KUBE_CROSS_VERSION: 'v1.35.0-go1.25.4-bullseye.0'
KUBE_CROSS_VERSION: 'v1.35.0-go1.25.5-bullseye.0'
v1.34-cross1.24-bullseye:
CONFIG: 'cross1.24'
KUBE_CROSS_VERSION: 'v1.34.0-go1.24.10-bullseye.0'
KUBE_CROSS_VERSION: 'v1.34.0-go1.24.11-bullseye.0'
v1.33-cross1.24-bullseye:
CONFIG: 'cross1.24'
KUBE_CROSS_VERSION: 'v1.33.0-go1.24.10-bullseye.0'
KUBE_CROSS_VERSION: 'v1.33.0-go1.24.11-bullseye.0'
v1.32-cross1.24-bullseye:
CONFIG: 'cross1.24'
KUBE_CROSS_VERSION: 'v1.32.0-go1.24.10-bullseye.0'
KUBE_CROSS_VERSION: 'v1.32.0-go1.24.11-bullseye.0'
4 changes: 2 additions & 2 deletions images/releng/k8s-ci-builder/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
TAG ?= $(shell git describe --tags --always --dirty)

# Build args
GO_VERSION ?= 1.25.4
GO_VERSION_TOOLING ?= 1.25.4
GO_VERSION ?= 1.25.5
GO_VERSION_TOOLING ?= 1.25.5
OS_CODENAME ?= bullseye
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

Expand Down
24 changes: 12 additions & 12 deletions images/releng/k8s-ci-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
variants:
default:
CONFIG: default
GO_VERSION: '1.25.4'
GO_VERSION_TOOLING: '1.25.4'
GO_VERSION: '1.25.5'
GO_VERSION_TOOLING: '1.25.5'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
GO_VERSION: '1.25.4'
GO_VERSION_TOOLING: '1.25.4'
GO_VERSION: '1.25.5'
GO_VERSION_TOOLING: '1.25.5'
OS_CODENAME: 'bookworm'
'1.35':
CONFIG: '1.35'
GO_VERSION: '1.25.4'
GO_VERSION_TOOLING: '1.25.4'
GO_VERSION: '1.25.5'
GO_VERSION_TOOLING: '1.25.5'
OS_CODENAME: 'bullseye'
'1.34':
CONFIG: '1.34'
GO_VERSION: '1.24.10'
GO_VERSION_TOOLING: '1.24.10'
GO_VERSION: '1.24.11'
GO_VERSION_TOOLING: '1.24.11'
OS_CODENAME: 'bullseye'
'1.33':
CONFIG: '1.33'
GO_VERSION: '1.24.10'
GO_VERSION_TOOLING: '1.24.10'
GO_VERSION: '1.24.11'
GO_VERSION_TOOLING: '1.24.11'
OS_CODENAME: 'bullseye'
'1.32':
CONFIG: '1.32'
GO_VERSION: '1.24.10'
GO_VERSION_TOOLING: '1.24.10'
GO_VERSION: '1.24.11'
GO_VERSION_TOOLING: '1.24.11'
OS_CODENAME: 'bullseye'