Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wip] Remove arch #3782

Closed
wants to merge 2 commits into from
Closed
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 @@ -22,7 +22,7 @@ dependencies:

# Golang
- name: "golang"
version: 1.22.7
version: 1.22.8
refPaths:
- path: images/build/cross/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -123,7 +123,7 @@ dependencies:

# go-runner
- name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)"
version: v2.3.1-go1.23.1-bookworm.0
version: v2.3.1-go1.23.2-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 @@ -137,7 +137,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner (go1.22-bookworm)"
version: v2.3.1-go1.22.7-bookworm.0
version: v2.3.1-go1.22.8-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 @@ -152,7 +152,7 @@ dependencies:

# kube-cross
- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)"
version: v1.31.0-go1.23.1-bullseye.0
version: v1.31.0-go1.23.2-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 @@ -172,7 +172,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.22)"
version: v1.31.0-go1.22.7-bullseye.0
version: v1.31.0-go1.22.8-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 @@ -193,7 +193,7 @@ dependencies:


- name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
version: v1.30.0-go1.22.7-bullseye.0
version: v1.30.0-go1.22.8-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 @@ -213,7 +213,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.22)"
version: v1.29.0-go1.22.7-bullseye.0
version: v1.29.0-go1.22.8-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 @@ -233,7 +233,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.22)"
version: v1.28.0-go1.22.7-bullseye.0
version: v1.28.0-go1.22.8-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 Down Expand Up @@ -297,7 +297,7 @@ dependencies:

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

# Golang (previous release branches: 1.30)
- name: "golang (previous release branches: 1.30)"
version: 1.22.7
version: 1.22.8
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -341,7 +341,7 @@ dependencies:

# Golang (previous release branches: 1.29)
- name: "golang (previous release branches: 1.29)"
version: 1.22.7
version: 1.22.8
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -358,7 +358,7 @@ dependencies:

# Golang (previous release branches: 1.28)
- name: "golang (previous release branches: 1.28)"
version: 1.22.7
version: 1.22.8
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
4 changes: 2 additions & 2 deletions 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.31.0
GO_VERSION ?= 1.22.7
GO_VERSION ?= 1.22.8
GO_MAJOR_VERSION ?= 1.22
OS_CODENAME ?= bullseye
REVISION ?= 0
Expand All @@ -53,7 +53,7 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
# TODO: Support multi-arch kube-cross images for linux/arm
# Currently some of the components references in the Dockerfile are
# not supported in specific architectures
PLATFORMS ?= linux/amd64 linux/arm64 linux/ppc64le linux/s390x #linux/arm
PLATFORMS ?= linux/amd64 linux/arm64 #linux/arm

# for legacy images only build linux/amd64
ifeq ($(TYPE), legacy)
Expand Down
24 changes: 12 additions & 12 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,54 @@ variants:
v1.32-go1.23-bullseye:
CONFIG: 'go1.23-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.32.0-go1.23.1-bullseye.0'
IMAGE_VERSION: 'v1.32.0-go1.23.2-bullseye.0'
KUBERNETES_VERSION: 'v1.32.0'
GO_VERSION: '1.23.1'
GO_VERSION: '1.23.2'
GO_MAJOR_VERSION: '1.23'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.31-go1.23-bullseye:
CONFIG: 'go1.23-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.31.0-go1.23.1-bullseye.0'
IMAGE_VERSION: 'v1.31.0-go1.23.2-bullseye.0'
KUBERNETES_VERSION: 'v1.31.0'
GO_VERSION: '1.23.1'
GO_VERSION: '1.23.2'
GO_MAJOR_VERSION: '1.23'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.31-go1.22-bullseye:
CONFIG: 'go1.22-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.31.0-go1.22.7-bullseye.0'
IMAGE_VERSION: 'v1.31.0-go1.22.8-bullseye.0'
KUBERNETES_VERSION: 'v1.31.0'
GO_VERSION: '1.22.7'
GO_VERSION: '1.22.8'
GO_MAJOR_VERSION: '1.22'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.30-go1.22-bullseye:
CONFIG: 'go1.22-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.30.0-go1.22.7-bullseye.0'
IMAGE_VERSION: 'v1.30.0-go1.22.8-bullseye.0'
KUBERNETES_VERSION: 'v1.30.0'
GO_VERSION: '1.22.7'
GO_VERSION: '1.22.8'
GO_MAJOR_VERSION: '1.22'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.29-go1.22-bullseye:
CONFIG: 'go1.22-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.29.0-go1.22.7-bullseye.0'
IMAGE_VERSION: 'v1.29.0-go1.22.8-bullseye.0'
KUBERNETES_VERSION: 'v1.29.0'
GO_VERSION: '1.22.7'
GO_VERSION: '1.22.8'
GO_MAJOR_VERSION: '1.22'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.28-go1.22-bullseye:
CONFIG: 'go1.22-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.28.0-go1.22.7-bullseye.0'
IMAGE_VERSION: 'v1.28.0-go1.22.8-bullseye.0'
KUBERNETES_VERSION: 'v1.28.0'
GO_VERSION: '1.22.7'
GO_VERSION: '1.22.8'
GO_MAJOR_VERSION: '1.22'
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.22
REVISION ?= 0
GO_VERSION ?= 1.22.7
GO_VERSION ?= 1.22.8
OS_CODENAME ?= bookworm

# Build args
Expand Down
8 changes: 4 additions & 4 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
variants:
go1.23-bookworm:
CONFIG: 'go1.23-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.23.1-bookworm.0'
IMAGE_VERSION: 'v2.3.1-go1.23.2-bookworm.0'
GO_MAJOR_VERSION: '1.23'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.23.1'
GO_VERSION: '1.23.2'
DISTROLESS_IMAGE: 'static-debian12'
go1.22-bookworm:
CONFIG: 'go1.22-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.22.7-bookworm.0'
IMAGE_VERSION: 'v2.3.1-go1.22.8-bookworm.0'
GO_MAJOR_VERSION: '1.22'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.22.7'
GO_VERSION: '1.22.8'
DISTROLESS_IMAGE: 'static-debian12'
4 changes: 2 additions & 2 deletions images/releng/ci/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
variants:
go1.23-bookworm:
CONFIG: 'go1.23-bookworm'
GO_VERSION: '1.23.1'
GO_VERSION: '1.23.2'
OS_CODENAME: 'bookworm'
REVISION: '0'
go1.22-bookworm:
CONFIG: 'go1.22-bookworm'
GO_VERSION: '1.22.7'
GO_VERSION: '1.22.8'
OS_CODENAME: 'bookworm'
REVISION: '0'
go1.21-bookworm:
Expand Down