From c203b120c00c7418fe2dd9a09767de98d27e9870 Mon Sep 17 00:00:00 2001 From: ArkaSaha30 Date: Mon, 29 Jul 2024 13:54:16 +0530 Subject: [PATCH 1/3] Revert "Bump images, dependencies and versions to go 1.23rc2" This reverts commit 9d5a7ff85984f98b3000dc507dcbe5e54ba810a0. --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 4 ++-- build/dependencies.yaml | 8 ++++---- test/images/Makefile | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.go-version b/.go-version index be5280d0a21..996d243921e 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23rc2 \ No newline at end of file +1.23rc1 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 8a7f1f76aba..69b36199c5a 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.31.0-go1.23rc2-bullseye.0 +v1.31.0-go1.23rc1-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 78fdb8fcc60..c43815a3ac8 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.1 -readonly __default_go_runner_version=v2.3.1-go1.23rc2-bookworm.0 +readonly __default_distroless_iptables_version=v0.6.0 +readonly __default_go_runner_version=v2.3.1-go1.23rc1-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.3 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 0a711634e06..fb19409187e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.23rc2 + version: 1.23rc1 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -141,7 +141,7 @@ dependencies: # match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.31.0-go1.23rc2-bullseye.0 + version: v1.31.0-go1.23rc1-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -179,7 +179,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.1 + version: v0.6.0 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -187,7 +187,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.23rc2-bookworm.0 + version: v2.3.1-go1.23rc1-bookworm.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/test/images/Makefile b/test/images/Makefile index 19c210365e5..5eacf82b966 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.23rc2 +GOLANG_VERSION=1.23rc1 export ifndef WHAT From d1dfeed505127d25d724b736091b6566c0bac483 Mon Sep 17 00:00:00 2001 From: ArkaSaha30 Date: Mon, 29 Jul 2024 13:55:03 +0530 Subject: [PATCH 2/3] Revert "Bump images, dependencies and versions to go 1.23rc1" This reverts commit 5c269fecf8010391c1d960eef79895085c978747. --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 4 ++-- build/dependencies.yaml | 27 ++++++++++++--------------- hack/lib/golang.sh | 1 - test/images/Makefile | 2 +- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.go-version b/.go-version index 996d243921e..054c858fbf3 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23rc1 \ No newline at end of file +1.22.5 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 69b36199c5a..58c49555cb7 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.31.0-go1.23rc1-bullseye.0 +v1.31.0-go1.22.5-bullseye.0 diff --git a/build/common.sh b/build/common.sh index c43815a3ac8..94b5492f296 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.0 -readonly __default_go_runner_version=v2.3.1-go1.23rc1-bookworm.0 +readonly __default_distroless_iptables_version=v0.5.6 +readonly __default_go_runner_version=v2.3.1-go1.22.5-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.3 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index fb19409187e..d37ab2c10b0 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,13 +116,12 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.23rc1 + version: 1.22.5 refPaths: - path: .go-version - path: build/build-image/cross/VERSION - # TODO: remove this when whe have the go1.23 released and not the rc. - # - path: staging/publishing/rules.yaml - # match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?' + - path: staging/publishing/rules.yaml + match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?' - path: test/images/Makefile match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+ @@ -131,17 +130,15 @@ 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. - - # TODO: remove this when whe have the go1.23 released and not the rc. - # - name: "golang: 1." - # version: 1.22 - # refPaths: - # - path: build/build-image/cross/VERSION - # - path: hack/lib/golang.sh - # match: minimum_go_version=go([0-9]+\.[0-9]+) + - name: "golang: 1." + version: 1.22 + refPaths: + - path: build/build-image/cross/VERSION + - path: hack/lib/golang.sh + match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.31.0-go1.23rc1-bullseye.0 + version: v1.31.0-go1.22.5-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -179,7 +176,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.0 + version: v0.5.6 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -187,7 +184,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.23rc1-bookworm.0 + version: v2.3.1-go1.22.5-bookworm.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 3ca29d25b84..1a65f82154b 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -538,7 +538,6 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)" local minimum_go_version - # TODO: Update to go1.23 as soon we are ready to merge this minimum_go_version=go1.22 if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then kube::log::usage_from_stdin < Date: Mon, 29 Jul 2024 13:55:37 +0530 Subject: [PATCH 3/3] Revert distroless-iptables from v0.6.1 to v0.5.6 This commit will revert the distroless-iptables version from v0.6.1(built on go1.23rc2) to v0.5.6(built on go1.22.5). Signed-off-by: ArkaSaha30 --- test/utils/image/manifest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index d06538d891a..b93383a7a88 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -229,7 +229,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"} - configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.1"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.6"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.15-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}