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.

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

[release-1.26] [go] Bump images, dependencies and versions to go 1.21.7 / distroless-iptables to v0.4.5 #123230

Merged
merged 1 commit into from
Feb 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20.13
1.21.7
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.26.0-go1.20.13-bullseye.0
v1.26.0-go1.21.7-bullseye.0
4 changes: 2 additions & 2 deletions build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ 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.2.9
readonly __default_go_runner_version=v2.3.1-go1.20.13-bullseye.0
readonly __default_distroless_iptables_version=v0.4.5
readonly __default_go_runner_version=v2.3.1-go1.21.7-bullseye.0
readonly __default_setcap_version=bullseye-v1.3.0

# These are the base images for the Docker-wrapped binaries.
Expand Down
10 changes: 5 additions & 5 deletions build/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies:

# Golang
- name: "golang: upstream version"
version: 1.20.13
version: 1.21.7
refPaths:
- path: .go-version
- path: build/build-image/cross/VERSION
Expand All @@ -103,7 +103,7 @@ dependencies:
# This entry is a stub of the major version to allow dependency checks to
# pass when building Kubernetes using a pre-release of Golang.
- name: "golang: 1.<major>"
version: 1.20
version: 1.21
refPaths:
- path: build/build-image/cross/VERSION
# we continue to test in the original go version which was go1.19
Expand All @@ -112,7 +112,7 @@ dependencies:
# match: minimum_go_version=go([0-9]+\.[0-9]+)

- name: "registry.k8s.io/kube-cross: dependents"
version: v1.26.0-go1.20.13-bullseye.0
version: v1.26.0-go1.21.7-bullseye.0
refPaths:
- path: build/build-image/cross/VERSION

Expand All @@ -134,15 +134,15 @@ dependencies:
match: BASE_IMAGE_VERSION\?=

- name: "registry.k8s.io/distroless-iptables: dependents"
version: v0.2.9
version: v0.4.5
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.20.13-bullseye.0
version: v2.3.1-go1.21.7-bullseye.0
refPaths:
- path: build/common.sh
match: __default_go_runner_version=
Expand Down
60 changes: 30 additions & 30 deletions staging/publishing/rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/code-generator
- name: release-1.26
go: 1.20.13
go: 1.21.7
source:
branch: release-1.26
dir: staging/src/k8s.io/code-generator
Expand Down Expand Up @@ -57,7 +57,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/apimachinery
- name: release-1.26
go: 1.20.13
go: 1.21.7
source:
branch: release-1.26
dir: staging/src/k8s.io/apimachinery
Expand Down Expand Up @@ -104,7 +104,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/api
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -184,7 +184,7 @@ rules:
go build -mod=mod ./...
go test -mod=mod ./...
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -260,7 +260,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/component-base
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -334,7 +334,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/component-helpers
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand All @@ -354,7 +354,7 @@ rules:
branch: master
dir: staging/src/k8s.io/kms
- name: release-1.26
go: 1.20.13
go: 1.21.7
source:
branch: release-1.26
dir: staging/src/k8s.io/kms
Expand Down Expand Up @@ -432,7 +432,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/apiserver
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -542,7 +542,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/kube-aggregator
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -680,7 +680,7 @@ rules:
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -801,7 +801,7 @@ rules:
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -923,7 +923,7 @@ rules:
required-packages:
- k8s.io/code-generator
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -1016,7 +1016,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/metrics
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -1092,7 +1092,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/cli-runtime
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: api
branch: release-1.26
Expand Down Expand Up @@ -1176,7 +1176,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/sample-cli-plugin
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: api
branch: release-1.26
Expand Down Expand Up @@ -1261,7 +1261,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/kube-proxy
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -1347,7 +1347,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/kubelet
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -1433,7 +1433,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/kube-scheduler
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -1531,7 +1531,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/controller-manager
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: api
branch: release-1.26
Expand Down Expand Up @@ -1653,7 +1653,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/cloud-provider
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: api
branch: release-1.26
Expand Down Expand Up @@ -1789,7 +1789,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/kube-controller-manager
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -1865,7 +1865,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/cluster-bootstrap
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand Down Expand Up @@ -1927,7 +1927,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/csi-translation-lib
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: api
branch: release-1.26
Expand Down Expand Up @@ -1964,7 +1964,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/mount-utils
- name: release-1.26
go: 1.20.13
go: 1.21.7
source:
branch: release-1.26
dir: staging/src/k8s.io/mount-utils
Expand Down Expand Up @@ -2101,7 +2101,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/legacy-cloud-providers
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: api
branch: release-1.26
Expand Down Expand Up @@ -2156,7 +2156,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/cri-api
- name: release-1.26
go: 1.20.13
go: 1.21.7
source:
branch: release-1.26
dir: staging/src/k8s.io/cri-api
Expand Down Expand Up @@ -2273,7 +2273,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/kubectl
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: api
branch: release-1.26
Expand Down Expand Up @@ -2379,7 +2379,7 @@ rules:
branch: release-1.25
dir: staging/src/k8s.io/pod-security-admission
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: api
branch: release-1.26
Expand Down Expand Up @@ -2415,7 +2415,7 @@ rules:
branch: master
dir: staging/src/k8s.io/dynamic-resource-allocation
- name: release-1.26
go: 1.20.13
go: 1.21.7
dependencies:
- repository: apimachinery
branch: release-1.26
Expand All @@ -2432,4 +2432,4 @@ rules:
dir: staging/src/k8s.io/dynamic-resource-allocation
recursive-delete-patterns:
- '*/.gitattributes'
default-go-version: 1.20.13
default-go-version: 1.21.7
2 changes: 1 addition & 1 deletion test/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
GOARM ?= 7
DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v5.1.0-2
GOLANG_VERSION=1.20.13
GOLANG_VERSION=1.21.7
export

ifndef WHAT
Expand Down
2 changes: 1 addition & 1 deletion test/utils/image/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-4"}
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.2.9"}
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.5"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.10-0"}
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"}
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
Expand Down