diff --git a/dependencies.yaml b/dependencies.yaml index 9001888a606..b6ec3b01d60 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -283,25 +283,19 @@ dependencies: # TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.22)" - version: v1.31.0-go1.22.8-bullseye.0 + version: v1.31.0-go1.22.9-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.30-cross1.22)" - version: v1.30.0-go1.22.8-bullseye.0 + version: v1.30.0-go1.22.9-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.29-cross1.22)" - version: v1.29.0-go1.22.8-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.28-cross1.22)" - version: v1.28.0-go1.22.8-bullseye.0 + version: v1.29.0-go1.22.9-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-]+)*))?)'" @@ -324,28 +318,21 @@ dependencies: # Golang (previous release branch: 1.31) - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.31)" - version: 1.22.8 + version: 1.22.9 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? # Golang (previous release branch: 1.30) - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)" - version: 1.22.8 + version: 1.22.9 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? # Golang (previous release branch: 1.29) - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)" - version: 1.22.8 - refPaths: - - path: images/releng/k8s-ci-builder/variants.yaml - match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? - - # Golang (previous release branch: 1.28) - - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)" - version: 1.22.8 + version: 1.22.9 refPaths: - path: images/releng/k8s-ci-builder/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index bfc7007c9d4..80c61380604 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -8,13 +8,10 @@ variants: # TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting v1.31-cross1.22-bullseye: CONFIG: 'cross1.22' - KUBE_CROSS_VERSION: 'v1.31.0-go1.22.8-bullseye.0' + KUBE_CROSS_VERSION: 'v1.31.0-go1.22.9-bullseye.0' v1.30-cross1.22-bullseye: CONFIG: 'cross1.22' - KUBE_CROSS_VERSION: 'v1.30.0-go1.22.8-bullseye.0' + KUBE_CROSS_VERSION: 'v1.30.0-go1.22.9-bullseye.0' v1.29-cross1.22-bullseye: CONFIG: 'cross1.21' - KUBE_CROSS_VERSION: 'v1.29.0-go1.22.8-bullseye.0' - v1.28-cross1.22-bullseye: - CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.28.0-go1.22.8-bullseye.0' + KUBE_CROSS_VERSION: 'v1.29.0-go1.22.9-bullseye.0' diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index 017cbbdc0db..df5426d976d 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -1,7 +1,7 @@ variants: default: CONFIG: default - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' OS_CODENAME: 'bullseye' next: CONFIG: next @@ -13,17 +13,13 @@ variants: OS_CODENAME: 'bullseye' '1.31': CONFIG: '1.31' - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' OS_CODENAME: 'bullseye' '1.30': CONFIG: '1.30' - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' OS_CODENAME: 'bullseye' '1.29': CONFIG: '1.29' - GO_VERSION: '1.22.8' - OS_CODENAME: 'bullseye' - '1.28': - CONFIG: '1.28' - GO_VERSION: '1.22.8' + GO_VERSION: '1.22.9' OS_CODENAME: 'bullseye'