Skip to content

Commit

Permalink
Bump images, dependencies and versions to go 1.21.11 and distroless i…
Browse files Browse the repository at this point in the history 
…ptables/setcap/debian-base

Signed-off-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
@cpanato
cpanato committed Jun 6, 2024
1 parent 734c5c7 commit 4a7948c
Show file tree
Hide file tree
Showing 17 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .go-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.10
1.21.11
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.29.0-go1.21.10-bullseye.0
v1.29.0-go1.21.11-bullseye.0
6 changes: 3 additions & 3 deletions build/common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
readonly KUBE_CONTAINER_RSYNC_PORT=8730

# These are the default versions (image tags) for their respective base images.
readonly __default_distroless_iptables_version=v0.4.8
readonly __default_go_runner_version=v2.3.1-go1.21.10-bookworm.0
readonly __default_setcap_version=bookworm-v1.0.2
readonly __default_distroless_iptables_version=v0.4.9
readonly __default_go_runner_version=v2.3.1-go1.21.11-bookworm.0
readonly __default_setcap_version=bookworm-v1.0.3

# These are the base images for the Docker-wrapped binaries.
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"
Expand Down
12 changes: 6 additions & 6 deletions build/dependencies.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ dependencies:

# Golang
- name: "golang: upstream version"
version: 1.21.10
version: 1.21.11
refPaths:
- path: .go-version
- path: build/build-image/cross/VERSION
Expand All @@ -140,13 +140,13 @@ dependencies:
match: minimum_go_version=go([0-9]+\.[0-9]+)

- name: "registry.k8s.io/kube-cross: dependents"
version: v1.29.0-go1.21.10-bullseye.0
version: v1.29.0-go1.21.11-bullseye.0
refPaths:
- path: build/build-image/cross/VERSION

# Base images
- name: "registry.k8s.io/debian-base: dependents"
version: bookworm-v1.0.2
version: bookworm-v1.0.3
refPaths:
- path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-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 @@ -178,15 +178,15 @@ dependencies:
match: registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-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/distroless-iptables: dependents"
version: v0.4.8
version: v0.4.9
refPaths:
- path: build/common.sh
match: __default_distroless_iptables_version=
- path: test/utils/image/manifest.go
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}

- name: "registry.k8s.io/go-runner: dependents"
version: v2.3.1-go1.21.10-bookworm.0
version: v2.3.1-go1.21.11-bookworm.0
refPaths:
- path: build/common.sh
match: __default_go_runner_version=
Expand Down Expand Up @@ -254,7 +254,7 @@ dependencies:
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}

- name: "registry.k8s.io/build-image/setcap: dependents"
version: bookworm-v1.0.2
version: bookworm-v1.0.3
refPaths:
- path: build/common.sh
match: __default_setcap_version=
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/gci/configure-helper.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3161,7 +3161,7 @@ spec:
- name: vol
containers:
- name: pv-recycler
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.2
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
command:
- /bin/sh
args:
Expand Down
10 changes: 5 additions & 5 deletions cluster/images/etcd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
DOCKERFILE := ${DOCKERFILE.${OS}}

ifeq ($(ARCH),amd64)
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.2
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
endif
ifeq ($(ARCH),s390x)
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
endif

BASE.windows = mcr.microsoft.com/windows/nanoserver
Expand Down
2 changes: 1 addition & 1 deletion pkg/volume/plugins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
Containers: []v1.Container{
{
Name: "pv-recycler",
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.2",
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.3",
Command: []string{"/bin/sh"},
Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
VolumeMounts: []v1.VolumeMount{
Expand Down
62 changes: 31 additions & 31 deletions staging/publishing/rules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rules:
dirs:
- staging/src/k8s.io/code-generator
- name: release-1.29
go: 1.21.10
go: 1.21.11
source:
branch: release-1.29
dirs:
Expand Down Expand Up @@ -68,7 +68,7 @@ rules:
dirs:
- staging/src/k8s.io/apimachinery
- name: release-1.29
go: 1.21.10
go: 1.21.11
source:
branch: release-1.29
dirs:
Expand Down Expand Up @@ -121,7 +121,7 @@ rules:
dirs:
- staging/src/k8s.io/api
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -207,7 +207,7 @@ rules:
go build -mod=mod ./...
go test -mod=mod ./...
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -289,7 +289,7 @@ rules:
dirs:
- staging/src/k8s.io/component-base
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -369,7 +369,7 @@ rules:
dirs:
- staging/src/k8s.io/component-helpers
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -425,7 +425,7 @@ rules:
dirs:
- staging/src/k8s.io/kms
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -519,7 +519,7 @@ rules:
dirs:
- staging/src/k8s.io/apiserver
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -641,7 +641,7 @@ rules:
dirs:
- staging/src/k8s.io/kube-aggregator
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -791,7 +791,7 @@ rules:
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -918,7 +918,7 @@ rules:
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -1052,7 +1052,7 @@ rules:
required-packages:
- k8s.io/code-generator
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -1151,7 +1151,7 @@ rules:
dirs:
- staging/src/k8s.io/metrics
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -1233,7 +1233,7 @@ rules:
dirs:
- staging/src/k8s.io/cli-runtime
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand Down Expand Up @@ -1323,7 +1323,7 @@ rules:
dirs:
- staging/src/k8s.io/sample-cli-plugin
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand Down Expand Up @@ -1414,7 +1414,7 @@ rules:
dirs:
- staging/src/k8s.io/kube-proxy
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -1461,7 +1461,7 @@ rules:
dirs:
- staging/src/k8s.io/cri-api
- name: release-1.29
go: 1.21.10
go: 1.21.11
source:
branch: release-1.29
dirs:
Expand Down Expand Up @@ -1556,7 +1556,7 @@ rules:
dirs:
- staging/src/k8s.io/kubelet
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -1654,7 +1654,7 @@ rules:
dirs:
- staging/src/k8s.io/kube-scheduler
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -1764,7 +1764,7 @@ rules:
dirs:
- staging/src/k8s.io/controller-manager
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand Down Expand Up @@ -1898,7 +1898,7 @@ rules:
dirs:
- staging/src/k8s.io/cloud-provider
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand Down Expand Up @@ -2046,7 +2046,7 @@ rules:
dirs:
- staging/src/k8s.io/kube-controller-manager
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -2128,7 +2128,7 @@ rules:
dirs:
- staging/src/k8s.io/cluster-bootstrap
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -2196,7 +2196,7 @@ rules:
dirs:
- staging/src/k8s.io/csi-translation-lib
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand Down Expand Up @@ -2239,7 +2239,7 @@ rules:
dirs:
- staging/src/k8s.io/mount-utils
- name: release-1.29
go: 1.21.10
go: 1.21.11
source:
branch: release-1.29
dirs:
Expand Down Expand Up @@ -2378,7 +2378,7 @@ rules:
dirs:
- staging/src/k8s.io/legacy-cloud-providers
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand Down Expand Up @@ -2520,7 +2520,7 @@ rules:
dirs:
- staging/src/k8s.io/kubectl
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand Down Expand Up @@ -2638,7 +2638,7 @@ rules:
dirs:
- staging/src/k8s.io/pod-security-admission
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand Down Expand Up @@ -2735,7 +2735,7 @@ rules:
dirs:
- staging/src/k8s.io/dynamic-resource-allocation
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: apimachinery
branch: release-1.29
Expand Down Expand Up @@ -2787,7 +2787,7 @@ rules:
dirs:
- staging/src/k8s.io/endpointslice
- name: release-1.29
go: 1.21.10
go: 1.21.11
dependencies:
- repository: api
branch: release-1.29
Expand All @@ -2803,4 +2803,4 @@ rules:
- staging/src/k8s.io/endpointslice
recursive-delete-patterns:
- '*/.gitattributes'
default-go-version: 1.21.10
default-go-version: 1.21.11
Loading

0 comments on commit 4a7948c

Please sign in to comment.