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

images: k8s-cloud-builder go1.18 and CVE updates for debian-base #2371

Merged
merged 2 commits into from
Dec 17, 2021
Merged

images: k8s-cloud-builder go1.18 and CVE updates for debian-base #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56304fb
[go1.18] Build k8s-cloud-builder:v1.24.0-go1.18beta1-bullseye.0
justaugustus Dec 17, 2021
509fb40
debian-base: Build bullseye-v1.1.0 and buster-v1.10.0
justaugustus Dec 17, 2021
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
14 changes: 4 additions & 10 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,6 @@ dependencies:
- 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 buster"
version: v1.23.0-go1.17.5-buster.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.18beta1
Expand Down Expand Up @@ -231,13 +225,13 @@ 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/kube-cross: config variant (next candidate)"
version: go1.17-bullseye
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: dependents (next candidate)"
version: v1.24.0-go1.17.5-bullseye.0
version: v1.24.0-go1.18beta1-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-]+)*))?)'"
Expand Down Expand Up @@ -369,7 +363,7 @@ dependencies:
match: "OS_CODENAME: 'bullseye'"

- name: "k8s.gcr.io/build-image/debian-base"
version: bullseye-v1.0.0
version: bullseye-v1.1.0
refPaths:
- path: images/build/debian-base/Makefile
match: IMAGE_VERSION\ \?=\ bullseye-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 @@ -412,7 +406,7 @@ dependencies:

# Base images (next candidate)
- name: "k8s.gcr.io/build-image/debian-base (next candidate)"
version: bullseye-v1.0.0
version: bullseye-v1.1.0
refPaths:
- path: images/build/debian-base/variants.yaml
match: "IMAGE_VERSION: 'bullseye-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
2 changes: 1 addition & 1 deletion images/build/debian-base/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ IMAGE ?= $(REGISTRY)/debian-base
BUILD_IMAGE ?= debian-build

TAG ?= $(shell git describe --tags --always --dirty)
IMAGE_VERSION ?= bullseye-v1.0.0
IMAGE_VERSION ?= bullseye-v1.1.0
CONFIG ?= bullseye

TAR_FILE ?= rootfs.tar
Expand Down
4 changes: 2 additions & 2 deletions images/build/debian-base/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ variants:
# Debian 11 - Kubernetes 1.23 and newer
bullseye:
CONFIG: 'bullseye'
IMAGE_VERSION: 'bullseye-v1.0.0'
IMAGE_VERSION: 'bullseye-v1.1.0'
# Debian 10 - Kubernetes 1.22 and older
buster:
CONFIG: 'buster'
IMAGE_VERSION: 'buster-v1.9.0'
IMAGE_VERSION: 'buster-v1.10.0'
6 changes: 3 additions & 3 deletions images/k8s-cloud-builder/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
variants:
v1.24-cross1.18-bullseye:
CONFIG: 'cross1.17'
KUBE_CROSS_VERSION: 'v1.24.0-go1.18beta1-bullseye.0'
v1.24-cross1.17-bullseye:
CONFIG: 'cross1.17'
KUBE_CROSS_VERSION: 'v1.24.0-go1.17.5-bullseye.0'
v1.23-cross1.17-bullseye:
CONFIG: 'cross1.17'
KUBE_CROSS_VERSION: 'v1.23.0-go1.17.5-bullseye.0'
v1.23-cross1.17-buster:
CONFIG: 'cross1.17'
KUBE_CROSS_VERSION: 'v1.23.0-go1.17.5-buster.0'
v1.22-cross1.16-buster:
CONFIG: 'cross1.16'
KUBE_CROSS_VERSION: 'v1.22.0-go1.16.12-buster.0'
Expand Down