From 5572625d87f2529e3cc85c3747bdf258b0ea2d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Fri, 4 Oct 2024 19:11:07 +0200 Subject: [PATCH] Revert "Merge pull request #127611 from haitch/haitao/k132-on-go123p1" This reverts commit 37004f89b0246fe85cfd5c7a96335363c5f1d9ff, reversing changes made to af879aebb1a866a2f0e45bb33c09a1cc8f7acc45. --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 4 ++-- build/dependencies.yaml | 8 ++++---- staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- test/utils/image/manifest.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.go-version b/.go-version index 1b50fc31bc7..bfbadb3a2ac 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23.1 \ No newline at end of file +1.23.0 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 4c722326773..39ff2433759 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.32.0-go1.23.1-bullseye.0 +v1.32.0-go1.23.0-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 4e59d16c50e..0ae42f4e15b 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,8 +97,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.6.3 -readonly __default_go_runner_version=v2.3.1-go1.23.1-bookworm.0 +readonly __default_distroless_iptables_version=v0.6.2 +readonly __default_go_runner_version=v2.3.1-go1.23.0-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.4 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 4ddd35d6601..b728ace289e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.23.1 + version: 1.23.0 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -140,7 +140,7 @@ dependencies: match: golang:([0-9]+\.[0-9]+).0-bullseye - name: "registry.k8s.io/kube-cross: dependents" - version: v1.32.0-go1.23.1-bullseye.0 + version: v1.32.0-go1.23.0-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -178,7 +178,7 @@ 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.6.3 + version: v0.6.2 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -186,7 +186,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.23.1-bookworm.0 + version: v2.3.1-go1.23.0-bookworm.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index c7316233931..31f6425babf 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2443,4 +2443,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.23.1 +default-go-version: 1.23.0 diff --git a/test/images/Makefile b/test/images/Makefile index 86962127b44..0c772a25b6d 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.23.1 +GOLANG_VERSION=1.23.0 export ifndef WHAT diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index c15065ebae5..6a04378da01 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -223,7 +223,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.29.2"} configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"} configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} - configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.3"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.2"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.16-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}