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.

Sign up for GitHub

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

Jump to bottom

build go images with 1.21.7 for old release branches and drop go1.20 images build #3461

Merged
merged 3 commits into from
Feb 10, 2024
Merged

build go images with 1.21.7 for old release branches and drop go1.20 images build #3461

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56c42ea
build go images with 1.21.7 for old release branches and drop go1.20 …
cpanato Feb 9, 2024
4d0e0f0
build go-runner for go1.21 with bullseye
cpanato Feb 9, 2024
82dd8ba
fix dependencies.yaml
cpanato Feb 10, 2024
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
47 changes: 11 additions & 36 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,28 +140,6 @@ dependencies:
- path: images/build/go-runner/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)"
version: v2.3.1-go1.20.14-bullseye.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.20-bullseye)"
version: 0
refPaths:
- path: images/build/go-runner/Makefile
match: REVISION \?= \d+
- path: images/build/go-runner/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bullseye)"
version: 0
refPaths:
- path: images/build/go-runner/Makefile
match: REVISION \?= \d+
- path: images/build/go-runner/variants.yaml
match: REVISION:\ '\d+'

# kube-cross
- name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
version: v1.30.0-go1.22-bullseye.0
Expand Down Expand Up @@ -203,14 +181,14 @@ dependencies:
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.20)"
version: v1.28.0-go1.20.14-bullseye.0
- name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.21)"
version: v1.28.0-go1.21.7-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.28-go1.20)"
version: go1.20-bullseye
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.28-go1.21)"
version: go1.21-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
Expand All @@ -223,8 +201,8 @@ dependencies:
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)"
version: v1.27.0-go1.20.14-bullseye.0
- name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.21)"
version: v1.27.0-go1.21.7-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 @@ -243,8 +221,8 @@ dependencies:
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.20)"
version: v1.26.0-go1.20.14-bullseye.0
- name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.21)"
version: v1.26.0-go1.21.7-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 @@ -350,7 +328,7 @@ dependencies:

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

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

# Golang (previous release branches: 1.26)
- name: "golang (previous release branches: 1.26)"
version: 1.20.14
version: 1.21.7
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -428,9 +406,6 @@ dependencies:
match: OS_CODENAME\ \?=\ bullseye
- path: images/build/cross/variants.yaml
match: "OS_CODENAME: 'bullseye'"
# We keep them around for backwards compatibility and release branches.
- path: images/build/go-runner/variants.yaml
match: "OS_CODENAME: 'bullseye'"
cpanato marked this conversation as resolved.
Show resolved Hide resolved
- path: images/releng/k8s-ci-builder/Makefile
match: OS_CODENAME\ \?=\ bullseye
- path: images/releng/k8s-ci-builder/variants.yaml
Expand Down
26 changes: 13 additions & 13 deletions images/build/cross/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@ variants:
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.28-go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
v1.28-go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.28.0-go1.20.14-bullseye.0'
IMAGE_VERSION: 'v1.28.0-go1.21.7-bullseye.0'
KUBERNETES_VERSION: 'v1.28.0'
GO_VERSION: '1.20.14'
GO_MAJOR_VERSION: '1.20'
GO_VERSION: '1.21.7'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.27-go1.20-bullseye:
v1.27-go1.21-bullseye:
CONFIG: 'go1.20-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.27.0-go1.20.14-bullseye.0'
IMAGE_VERSION: 'v1.27.0-go1.21.7-bullseye.0'
KUBERNETES_VERSION: 'v1.27.0'
GO_VERSION: '1.20.14'
GO_MAJOR_VERSION: '1.20'
GO_VERSION: '1.21.7'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.26-go1.20-bullseye:
v1.26-go1.21-bullseye:
CONFIG: 'go1.20-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.26.0-go1.20.14-bullseye.0'
IMAGE_VERSION: 'v1.26.0-go1.21.7-bullseye.0'
KUBERNETES_VERSION: 'v1.26.0'
GO_VERSION: '1.20.14'
GO_MAJOR_VERSION: '1.20'
GO_VERSION: '1.21.7'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
8 changes: 0 additions & 8 deletions images/build/go-runner/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,3 @@ variants:
REVISION: '0'
GO_VERSION: '1.21.7'
DISTROLESS_IMAGE: 'static-debian12'
go1.20-bullseye:
cpanato marked this conversation as resolved.
Show resolved Hide resolved
CONFIG: 'go1.20-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.20.14-bullseye.0'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.20.14'
DISTROLESS_IMAGE: 'static-debian11'
5 changes: 0 additions & 5 deletions images/releng/ci/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,3 @@ variants:
GO_VERSION: '1.21.7'
OS_CODENAME: 'bookworm'
REVISION: '0'
go1.20-bookworm:
CONFIG: 'go1.20-bookworm'
GO_VERSION: '1.20.14'
OS_CODENAME: 'bookworm'
REVISION: '0'
Loading