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

Cleanup #2906

Merged
merged 3 commits into from
Feb 13, 2023
Merged

Cleanup #2906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e86b1d
drop go1.17 builds
cpanato Feb 11, 2023
0c495a7
update debian iptables to use latest gorunner with go1.19.5
cpanato Feb 11, 2023
b89eb08
cleanup and organize a bit better kube-cross and gorunner deps
cpanato Feb 11, 2023
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
232 changes: 163 additions & 69 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,96 +150,226 @@ dependencies:
- path: images/releng/ci/variants.yaml
match: REVISION:\ '\d+'

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

- name: "k8s.gcr.io/build-image/go-runner (go1.18-bullseye)"
version: v2.3.1-go1.18.10-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: "k8s.gcr.io/build-image/go-runner: image revision (go1.18-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: "k8s.gcr.io/build-image/kube-cross (v1.27-go1.20)"
version: v1.27.0-go1.20-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: "k8s.gcr.io/build-image/kube-cross: config variant (v1.27-go1.20)"
version: go1.20-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.27-go1.20)"
version: 0
refPaths:
- path: images/build/cross/Makefile
match: REVISION \?= \d+
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross (v1.26-go1.19)"
version: v1.26.0-go1.19.5-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: "k8s.gcr.io/build-image/kube-cross: config variant"
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.26-go1.19)"
version: go1.19-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

- name: "k8s.gcr.io/build-image/kube-cross: image revision"
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.26-go1.19)"
version: 0
refPaths:
- path: images/build/cross/Makefile
match: REVISION \?= \d+
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross: dependents bullseye"
version: v1.26.0-go1.19.5-bullseye.0
- name: "k8s.gcr.io/build-image/kube-cross (v1.25-go1.19)"
version: v1.25.0-go1.19.5-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-]+)*))?)'"
- 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-]+)*))?)'"

# Golang (next candidate)
- name: "golang (next candidate)"
version: 1.20
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.25-go1.19)"
version: go1.19-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
- path: images/build/go-runner/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
- path: images/releng/ci/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

# Golang images (next candidate)
- name: "gcr.io/k8s-staging-releng/releng-ci: image revision (next candidate)"
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.25-go1.19)"
version: 0
refPaths:
- path: images/releng/ci/variants.yaml
- path: images/build/cross/Makefile
match: REVISION \?= \d+
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/go-runner (next candidate)"
version: v2.3.1-go1.20-bullseye.0
- name: "k8s.gcr.io/build-image/kube-cross (v1.24-go1.19)"
version: v1.24.0-go1.19.5-bullseye.0
refPaths:
- path: images/build/go-runner/variants.yaml
- 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: "k8s.gcr.io/build-image/go-runner: image revision (next candidate)"
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.24-go1.19)"
version: go1.19-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.24-go1.19)"
version: 0
refPaths:
- path: images/build/go-runner/variants.yaml
- path: images/build/cross/Makefile
match: REVISION \?= \d+
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross (next candidate)"
version: v1.27.0-go1.20-bullseye.0
- name: "k8s.gcr.io/build-image/kube-cross (v1.24-go1.18)"
version: v1.24.0-go1.18.10-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: "k8s.gcr.io/build-image/kube-cross: config variant (next candidate)"
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.24-go1.18)"
version: go1.18-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.24-go1.18)"
version: 0
refPaths:
- path: images/build/cross/Makefile
match: REVISION \?= \d+
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross (v1.23-go1.19)"
version: v1.23.0-go1.19.5-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: "k8s.gcr.io/build-image/kube-cross: config variant (v1.23-go1.19)"
version: go1.19-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

- name: "k8s.gcr.io/build-image/kube-cross: dependents (next candidate)"
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.23-go1.19)"
version: 0
refPaths:
- path: images/build/cross/Makefile
match: REVISION \?= \d+
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.27-cross1.20)"
version: v1.27.0-go1.20-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: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.26-cross1.20)"
version: v1.26.0-go1.19.5-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: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.25-cross1.20)"
version: v1.25.0-go1.19.5-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: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.24-cross1.20)"
version: v1.24.0-go1.19.5-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: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.23-cross1.20)"
version: v1.23.0-go1.19.5-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-]+)*))?)'"

# Golang (next candidate)
- name: "golang (next candidate)"
version: 1.20
refPaths:
- path: images/build/cross/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
- path: images/build/go-runner/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
- path: images/releng/ci/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
- path: images/releng/k8s-ci-builder/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

# Golang images (next candidate)
- name: "gcr.io/k8s-staging-releng/releng-ci: image revision (next candidate)"
version: 0
refPaths:
- path: images/releng/ci/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross: config variant (next candidate)"
version: go1.20-bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"

# Golang (previous release branches: 1.24)
- name: "golang (previous release branches: 1.24)"
version: 1.19.5
Expand Down Expand Up @@ -281,42 +411,6 @@ dependencies:
- path: images/releng/ci/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.24)"
version: v2.3.1-go1.19.5-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: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.23)"
version: v2.3.1-go1.17.13-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: "k8s.gcr.io/build-image/go-runner: image revision (for previous release branches)"
version: 0
refPaths:
- path: images/build/go-runner/variants.yaml
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.25)"
version: v1.25.0-go1.19.5-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: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.24)"
version: v1.24.0-go1.19.5-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: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.23)"
version: v1.23.0-go1.19.5-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-]+)*))?)'"

# golangci-lint-version
- name: "golangci-lint"
version: 1.51.0
Expand Down Expand Up @@ -413,7 +507,7 @@ dependencies:
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: "k8s.gcr.io/build-image/go-runner: dependents"
version: v2.3.1-go1.19.1-bullseye.0
version: v2.3.1-go1.19.5-bullseye.0
refPaths:
- path: images/build/debian-iptables/Makefile
match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+
Expand Down
10 changes: 0 additions & 10 deletions images/build/cross/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,3 @@ variants:
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
v1.23-go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.23.0-go1.17.13-bullseye.0'
KUBERNETES_VERSION: 'v1.23.0'
GO_VERSION: '1.17.13'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
2 changes: 1 addition & 1 deletion images/build/debian-iptables/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ TAG ?= $(shell git describe --tags --always --dirty)
IMAGE_VERSION ?= bullseye-v1.5.1
CONFIG ?= bullseye
DEBIAN_BASE_VERSION ?= bullseye-v1.4.2
GORUNNER_VERSION ?= v2.3.1-go1.19.1-bullseye.0
GORUNNER_VERSION ?= v2.3.1-go1.19.5-bullseye.0

ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
Expand Down
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 @@ -23,11 +23,3 @@ variants:
REVISION: '0'
GO_VERSION: '1.18.10'
DISTROLESS_IMAGE: 'static-debian11'
go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.17.13-bullseye.0'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.17.13'
DISTROLESS_IMAGE: 'static-debian11'