github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126330 from ArkaSaha30/revert-to-go1.22

Browse Source 
Revert to go1.22.5
This commit is contained in:
Kubernetes Prow Robot 2024-07-29 04:04:23 -07:00 committed by GitHub
commit 05934d6283
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@ -1 +1 @@
1.23rc2 1.22.5

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.31.0-go1.23rc2-bullseye.0 v1.31.0-go1.22.5-bullseye.0

4
build/common.sh
View File

@ -97,8 +97,8 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
readonly KUBE_CONTAINER_RSYNC_PORT=8730 readonly KUBE_CONTAINER_RSYNC_PORT=8730
# These are the default versions (image tags) for their respective base images. # These are the default versions (image tags) for their respective base images.
readonly __default_distroless_iptables_version=v0.6.1 readonly __default_distroless_iptables_version=v0.5.6
readonly __default_go_runner_version=v2.3.1-go1.23rc2-bookworm.0 readonly __default_go_runner_version=v2.3.1-go1.22.5-bookworm.0
readonly __default_setcap_version=bookworm-v1.0.3 readonly __default_setcap_version=bookworm-v1.0.3
# These are the base images for the Docker-wrapped binaries. # These are the base images for the Docker-wrapped binaries.

27
build/dependencies.yaml
View File

@ -116,13 +116,12 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.23rc2 version: 1.22.5
refPaths: refPaths:
- path: .go-version - path: .go-version
- path: build/build-image/cross/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
# - path: staging/publishing/rules.yaml match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
# match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
- path: test/images/Makefile - path: test/images/Makefile
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+ 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 # This entry is a stub of the major version to allow dependency checks to
# pass when building Kubernetes using a pre-release of Golang. # pass when building Kubernetes using a pre-release of Golang.
- name: "golang: 1.<major>"
# TODO: remove this when whe have the go1.23 released and not the rc. version: 1.22
# - name: "golang: 1.<major>" refPaths:
# version: 1.22 - path: build/build-image/cross/VERSION
# refPaths: - path: hack/lib/golang.sh
# - path: build/build-image/cross/VERSION match: minimum_go_version=go([0-9]+\.[0-9]+)
# - path: hack/lib/golang.sh
# match: minimum_go_version=go([0-9]+\.[0-9]+)
- name: "registry.k8s.io/kube-cross: dependents" - name: "registry.k8s.io/kube-cross: dependents"
version: v1.31.0-go1.23rc2-bullseye.0 version: v1.31.0-go1.22.5-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - 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-]+)*))?) 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" - name: "registry.k8s.io/distroless-iptables: dependents"
version: v0.6.1 version: v0.5.6
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_distroless_iptables_version= 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]+)"} match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
- name: "registry.k8s.io/go-runner: dependents" - name: "registry.k8s.io/go-runner: dependents"
version: v2.3.1-go1.23rc2-bookworm.0 version: v2.3.1-go1.22.5-bookworm.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=

1
hack/lib/golang.sh
View File

@ -538,7 +538,6 @@ EOF
local go_version local go_version
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)" IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
local minimum_go_version local minimum_go_version
# TODO: Update to go1.23 as soon we are ready to merge this
minimum_go_version=go1.22 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 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 <<EOF kube::log::usage_from_stdin <<EOF

2
test/images/Makefile
View File

@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
GOARM ?= 7 GOARM ?= 7
DOCKER_CERT_BASE_PATH ?= DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v5.1.0-2 QEMUVERSION=v5.1.0-2
GOLANG_VERSION=1.23rc2 GOLANG_VERSION=1.22.5
export export
ifndef WHAT ifndef WHAT

2
test/utils/image/manifest.go
View File

@ -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[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"} 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[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.15-0"}
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}