Skip to content

Commit

Permalink
Merge pull request #3495 from cpanato/bump-clooud-ci-builder
Browse files Browse the repository at this point in the history
Build k8s-ci-builder and k8s-cloud-bulider with Go 1.22.1 and 1.21.8
  • Loading branch information
k8s-ci-robot committed Mar 7, 2024
2 parents 5cdeee7 + ce24db0 commit f42d376
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
20 changes: 10 additions & 10 deletions dependencies.yaml
Expand Up @@ -67,7 +67,7 @@ dependencies:
match: go \d+.\d+

- name: "golang: after kubernetes/kubernetes update"
version: 1.22
version: 1.22.1
refPaths:
- path: images/releng/k8s-ci-builder/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -242,31 +242,31 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.30-cross1.22)"
version: v1.30.0-go1.22.0-bullseye.0
version: v1.30.0-go1.22.1-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.21)"
version: v1.29.0-go1.21.7-bullseye.0
version: v1.29.0-go1.21.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.21)"
version: v1.28.0-go1.21.7-bullseye.0
version: v1.28.0-go1.21.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.27-cross1.21)"
version: v1.27.0-go1.21.7-bullseye.0
version: v1.27.0-go1.21.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.26-cross1.21)"
version: v1.26.0-go1.21.7-bullseye.0
version: v1.26.0-go1.21.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-]+)*))?)'"
Expand Down Expand Up @@ -315,7 +315,7 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)"
version: 1.21.7
version: 1.21.8
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -338,7 +338,7 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)"
version: 1.21.7
version: 1.21.8
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -355,7 +355,7 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.27)"
version: 1.21.7
version: 1.21.8
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -372,7 +372,7 @@ dependencies:
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.26)"
version: 1.21.7
version: 1.21.8
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
10 changes: 5 additions & 5 deletions images/k8s-cloud-builder/variants.yaml
@@ -1,16 +1,16 @@
variants:
v1.30-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.0-bullseye.0'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.1-bullseye.0'
v1.29-cross1.21-bullseye:
CONFIG: 'cross1.21'
KUBE_CROSS_VERSION: 'v1.29.0-go1.21.7-bullseye.0'
KUBE_CROSS_VERSION: 'v1.29.0-go1.21.8-bullseye.0'
v1.28-cross1.20-bullseye:
CONFIG: 'cross1.20'
KUBE_CROSS_VERSION: 'v1.28.0-go1.21.7-bullseye.0'
KUBE_CROSS_VERSION: 'v1.28.0-go1.21.8-bullseye.0'
v1.27-cross1.20-bullseye:
CONFIG: 'cross1.20'
KUBE_CROSS_VERSION: 'v1.27.0-go1.21.7-bullseye.0'
KUBE_CROSS_VERSION: 'v1.27.0-go1.21.8-bullseye.0'
v1.26-cross1.20-bullseye:
CONFIG: 'cross1.20'
KUBE_CROSS_VERSION: 'v1.26.0-go1.21.7-bullseye.0'
KUBE_CROSS_VERSION: 'v1.26.0-go1.21.8-bullseye.0'
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/Makefile
Expand Up @@ -24,7 +24,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
TAG ?= $(shell git describe --tags --always --dirty)

# Build args
GO_VERSION ?= 1.22.0
GO_VERSION ?= 1.22.1
OS_CODENAME ?= bullseye
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

Expand Down
14 changes: 7 additions & 7 deletions images/releng/k8s-ci-builder/variants.yaml
@@ -1,29 +1,29 @@
variants:
default:
CONFIG: default
GO_VERSION: '1.21.7'
GO_VERSION: '1.22.1'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
GO_VERSION: '1.22.0'
GO_VERSION: '1.22.1'
OS_CODENAME: 'bookworm'
'1.30':
CONFIG: '1.30'
GO_VERSION: '1.22.0'
GO_VERSION: '1.22.1'
OS_CODENAME: 'bullseye'
'1.29':
CONFIG: '1.29'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
OS_CODENAME: 'bullseye'
'1.28':
CONFIG: '1.28'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
OS_CODENAME: 'bullseye'
'1.27':
CONFIG: '1.27'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
OS_CODENAME: 'bullseye'
'1.26':
CONFIG: '1.26'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
OS_CODENAME: 'bullseye'

0 comments on commit f42d376

Please sign in to comment.