Skip to content

Commit

Permalink
Merge pull request #3656 from cpanato/drop-go-121
Browse files Browse the repository at this point in the history
drop building images for go1.21.x
  • Loading branch information
k8s-ci-robot authored Jun 26, 2024
2 parents 1d79c87 + dc2118b commit d694c2e
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 55 deletions.
29 changes: 0 additions & 29 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,6 @@ dependencies:
- path: images/build/go-runner/variants.yaml
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)"
version: v2.3.1-go1.21.11-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-]+)*))?)

- name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bookworm)"
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.31-go1.22)"
version: v1.31.0-go1.22.4-bullseye.0
Expand Down Expand Up @@ -405,9 +391,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'"
- path: images/releng/k8s-ci-builder/Makefile
match: OS_CODENAME\ \?=\ bullseye
- path: images/releng/k8s-ci-builder/variants.yaml
Expand Down Expand Up @@ -463,18 +446,6 @@ dependencies:
- path: images/build/distroless-iptables/variants.yaml
match: GORUNNER_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/distroless-iptables (distroless-bookworm-go1.21)"
version: v0.4.9
refPaths:
- path: images/build/distroless-iptables/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/go-runner: dependents (distroless-bookworm-go1.21)"
version: v2.3.1-go1.21.11-bookworm.0
refPaths:
- path: images/build/distroless-iptables/variants.yaml
match: GORUNNER_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/setcap"
version: bookworm-v1.0.3
refPaths:
Expand Down
5 changes: 0 additions & 5 deletions images/build/distroless-iptables/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@ variants:
IMAGE_VERSION: 'v0.5.5'
BASEIMAGE: 'debian:bookworm-slim'
GORUNNER_VERSION: 'v2.3.1-go1.22.4-bookworm.0'
distroless-bookworm-go1.21:
CONFIG: 'distroless-bookworm'
IMAGE_VERSION: 'v0.4.9'
BASEIMAGE: 'debian:bookworm-slim'
GORUNNER_VERSION: 'v2.3.1-go1.21.11-bookworm.0'
16 changes: 0 additions & 16 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,3 @@ variants:
REVISION: '0'
GO_VERSION: '1.22.4'
DISTROLESS_IMAGE: 'static-debian12'
go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.21.11-bookworm.0'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.21.11'
DISTROLESS_IMAGE: 'static-debian12'
go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.21.11-bullseye.0'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.21.11'
DISTROLESS_IMAGE: 'static-debian11'
5 changes: 0 additions & 5 deletions images/releng/ci/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@ variants:
GO_VERSION: '1.22.4'
OS_CODENAME: 'bookworm'
REVISION: '0'
go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
GO_VERSION: '1.21.11'
OS_CODENAME: 'bookworm'
REVISION: '0'

0 comments on commit d694c2e

Please sign in to comment.