From 4363f2bd6c14483ff196200689da8ea0c21a79b4 Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 6 Mar 2024 10:32:40 -0500 Subject: [PATCH] [go] Bump images, dependencies and versions to go 1.21.8 / distroless-iptables to v0.4.6 Signed-off-by: cpanato --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 4 +-- build/dependencies.yaml | 8 ++--- staging/publishing/rules.yaml | 60 ++++++++++++++++----------------- test/images/Makefile | 2 +- test/utils/image/manifest.go | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.go-version b/.go-version index 915ddf30ebe1..5c9a6fe71a59 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.7 \ No newline at end of file +1.21.8 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index b0445c7b2eb5..ef8ee482c4d3 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.26.0-go1.21.7-bullseye.0 +v1.26.0-go1.21.8-bullseye.0 diff --git a/build/common.sh b/build/common.sh index f32b6fc78bc2..627f0b5a00e4 100755 --- a/build/common.sh +++ b/build/common.sh @@ -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.4.5 -readonly __default_go_runner_version=v2.3.1-go1.21.7-bullseye.0 +readonly __default_distroless_iptables_version=v0.4.6 +readonly __default_go_runner_version=v2.3.1-go1.21.8-bullseye.0 readonly __default_setcap_version=bullseye-v1.3.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 4c1f5ce5c00d..09dc34a3ed88 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -88,7 +88,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.21.7 + version: 1.21.8 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -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.21.7-bullseye.0 + version: v1.26.0-go1.21.8-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -134,7 +134,7 @@ dependencies: match: BASE_IMAGE_VERSION\?= - name: "registry.k8s.io/distroless-iptables: dependents" - version: v0.4.5 + version: v0.4.6 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -142,7 +142,7 @@ dependencies: 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.7-bullseye.0 + version: v2.3.1-go1.21.8-bullseye.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 6f6e6312c308..1a410260915a 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -26,7 +26,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/code-generator - name: release-1.26 - go: 1.21.7 + go: 1.21.8 source: branch: release-1.26 dir: staging/src/k8s.io/code-generator @@ -57,7 +57,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/apimachinery - name: release-1.26 - go: 1.21.7 + go: 1.21.8 source: branch: release-1.26 dir: staging/src/k8s.io/apimachinery @@ -104,7 +104,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/api - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -184,7 +184,7 @@ rules: go build -mod=mod ./... go test -mod=mod ./... - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -260,7 +260,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/component-base - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -334,7 +334,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/component-helpers - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -354,7 +354,7 @@ rules: branch: master dir: staging/src/k8s.io/kms - name: release-1.26 - go: 1.21.7 + go: 1.21.8 source: branch: release-1.26 dir: staging/src/k8s.io/kms @@ -432,7 +432,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/apiserver - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -542,7 +542,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kube-aggregator - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -680,7 +680,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -801,7 +801,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -923,7 +923,7 @@ rules: required-packages: - k8s.io/code-generator - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -1016,7 +1016,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/metrics - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -1092,7 +1092,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/cli-runtime - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: api branch: release-1.26 @@ -1176,7 +1176,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/sample-cli-plugin - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: api branch: release-1.26 @@ -1261,7 +1261,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kube-proxy - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -1347,7 +1347,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kubelet - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -1433,7 +1433,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kube-scheduler - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -1531,7 +1531,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/controller-manager - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: api branch: release-1.26 @@ -1653,7 +1653,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/cloud-provider - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: api branch: release-1.26 @@ -1789,7 +1789,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kube-controller-manager - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -1865,7 +1865,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/cluster-bootstrap - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -1927,7 +1927,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/csi-translation-lib - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: api branch: release-1.26 @@ -1964,7 +1964,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/mount-utils - name: release-1.26 - go: 1.21.7 + go: 1.21.8 source: branch: release-1.26 dir: staging/src/k8s.io/mount-utils @@ -2101,7 +2101,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/legacy-cloud-providers - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: api branch: release-1.26 @@ -2156,7 +2156,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/cri-api - name: release-1.26 - go: 1.21.7 + go: 1.21.8 source: branch: release-1.26 dir: staging/src/k8s.io/cri-api @@ -2273,7 +2273,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/kubectl - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: api branch: release-1.26 @@ -2379,7 +2379,7 @@ rules: branch: release-1.25 dir: staging/src/k8s.io/pod-security-admission - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: api branch: release-1.26 @@ -2415,7 +2415,7 @@ rules: branch: master dir: staging/src/k8s.io/dynamic-resource-allocation - name: release-1.26 - go: 1.21.7 + go: 1.21.8 dependencies: - repository: apimachinery branch: release-1.26 @@ -2432,4 +2432,4 @@ rules: dir: staging/src/k8s.io/dynamic-resource-allocation recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.21.7 +default-go-version: 1.21.8 diff --git a/test/images/Makefile b/test/images/Makefile index 403850e19f24..769be9c7c863 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -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.21.7 +GOLANG_VERSION=1.21.8 export ifndef WHAT diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index e2afd4fd937b..bda2134b84f2 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -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.4.5"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.6"} 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"}