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 dependencies.yaml #3364

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Cleanup dependencies.yaml #3364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 15 additions & 36 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ dependencies:
- path: images/build/go-runner/cloudbuild.yaml
match: ghcr.io/sigstore/cosign/cosign:v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?@sha256:[a-f0-9]{64}

# Docker
# TODO(deps): Not active yet
#- name: "docker"
# version: 19.03

# Golang
- name: "golang"
version: 1.21.4
Expand Down Expand Up @@ -358,55 +353,39 @@ dependencies:
match: "version: v\\d+.\\d+?\\.?(\\d+)?"

# Base images
# # Use bullseye for kube-cross to achieve maximum glibc compatibility.
# Use bullseye for kube-cross to achieve maximum glibc compatibility.
- name: "Debian: codename (bullseye)"
version: bullseye
refPaths:
- path: images/build/cross/Makefile
match: OS_CODENAME\ \?=\ bullseye

- name: "Debian: codename (default)"
version: bullseye
refPaths:
- path: images/build/cross/variants.yaml
match: "OS_CODENAME: 'bullseye'"
# TODO: revert once all images are on bookworm
# - path: images/build/debian-base/Makefile
# match: CONFIG\ \?=\ bullseye
# - path: images/build/debian-base/variants.yaml
# match: "CONFIG: 'bullseye'"
# Must match distroless Debian version as well
# - path: images/build/go-runner/Makefile
# 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'"
# TODO: revert once all images are on bookworm
# - path: images/build/setcap/Makefile
# match: CONFIG\ \?=\ bullseye
# - path: images/build/setcap/variants.yaml
# match: "CONFIG: 'bullseye'"
# - path: images/releng/ci/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
match: "OS_CODENAME: 'bullseye'"


- name: "Debian: codename (next candidate)"
- name: "Debian: codename (default)"
version: bookworm
refPaths:
# TODO: revert once all images are on bookworm
# - path: images/build/cross/variants.yaml
# match: "OS_CODENAME: 'bullseye'"
- path: images/build/debian-base/Makefile
match: CONFIG\ \?=\ bookworm
- path: images/build/debian-base/variants.yaml
match: "CONFIG: 'bookworm'"
# - path: images/build/go-runner/variants.yaml
# match: "OS_CODENAME: 'bullseye'"
# - path: images/releng/ci/variants.yaml
# match: "OS_CODENAME: 'bullseye'"
# - path: images/releng/k8s-ci-builder/variants.yaml
# match: "OS_CODENAME: 'bullseye'"
- path: images/build/go-runner/Makefile
match: OS_CODENAME\ \?=\ bookworm
- path: images/build/setcap/Makefile
match: CONFIG\ \?=\ bookworm
- path: images/build/setcap/variants.yaml
match: "CONFIG: 'bookworm'"
- path: images/releng/ci/variants.yaml
match: "OS_CODENAME: 'bookworm'"
- path: images/releng/k8s-ci-builder/variants.yaml
match: "OS_CODENAME: 'bookworm'"

- name: "registry.k8s.io/build-image/debian-base"
version: bookworm-v1.0.0
Expand Down