mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-10-31 18:28:13 +00:00 
			
		
		
		
	[go] Bump images, dependencies and versions to go 1.22
Signed-off-by: cpanato <ctadeu@gmail.com>
This commit is contained in:
		| @@ -1 +1 @@ | |||||||
| 1.22rc2 | 1.22 | ||||||
| @@ -1 +1 @@ | |||||||
| v1.30.0-go1.22rc2-bullseye.0 | v1.30.0-go1.22-bullseye.0 | ||||||
|   | |||||||
| @@ -96,8 +96,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.5.0 | readonly __default_distroless_iptables_version=v0.5.1 | ||||||
| readonly __default_go_runner_version=v2.3.1-go1.22rc2-bookworm.0 | readonly __default_go_runner_version=v2.3.1-go1.22-bookworm.0 | ||||||
| readonly __default_setcap_version=bookworm-v1.0.1 | readonly __default_setcap_version=bookworm-v1.0.1 | ||||||
|  |  | ||||||
| # These are the base images for the Docker-wrapped binaries. | # These are the base images for the Docker-wrapped binaries. | ||||||
|   | |||||||
| @@ -118,13 +118,12 @@ dependencies: | |||||||
|  |  | ||||||
|   # Golang |   # Golang | ||||||
|   - name: "golang: upstream version" |   - name: "golang: upstream version" | ||||||
|     version: 1.22rc2 |     version: 1.22 | ||||||
|     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.22 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+ | ||||||
|  |  | ||||||
| @@ -133,16 +132,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. | ||||||
|   # TODO: remove this when whe have the go1.22 released and not the rc. |   - name: "golang: 1.<major>" | ||||||
|   # - name: "golang: 1.<major>" |     version: 1.22 | ||||||
|   #   version: 1.22 |     refPaths: | ||||||
|   #   refPaths: |     - path: build/build-image/cross/VERSION | ||||||
|   #   - path: build/build-image/cross/VERSION |     - path: hack/lib/golang.sh | ||||||
|   #   - path: hack/lib/golang.sh |       match: minimum_go_version=go([0-9]+\.[0-9]+) | ||||||
|   #     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.30.0-go1.22rc2-bullseye.0 |     version: v1.30.0-go1.22-bullseye.0 | ||||||
|     refPaths: |     refPaths: | ||||||
|     - path: build/build-image/cross/VERSION |     - path: build/build-image/cross/VERSION | ||||||
|  |  | ||||||
| @@ -180,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-]+)*))?) |       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.5.0 |     version: v0.5.1 | ||||||
|     refPaths: |     refPaths: | ||||||
|     - path: build/common.sh |     - path: build/common.sh | ||||||
|       match: __default_distroless_iptables_version= |       match: __default_distroless_iptables_version= | ||||||
| @@ -188,7 +186,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.22rc2-bookworm.0 |     version: v2.3.1-go1.22-bookworm.0 | ||||||
|     refPaths: |     refPaths: | ||||||
|     - path: build/common.sh |     - path: build/common.sh | ||||||
|       match: __default_go_runner_version= |       match: __default_go_runner_version= | ||||||
|   | |||||||
| @@ -497,8 +497,7 @@ 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.22 as soon we are ready to merge this |   minimum_go_version=go1.22 | ||||||
|   minimum_go_version=go1.21 |  | ||||||
|   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 | ||||||
| Detected go version: ${go_version[*]}. | Detected go version: ${go_version[*]}. | ||||||
|   | |||||||
| @@ -2392,4 +2392,4 @@ rules: | |||||||
|       - staging/src/k8s.io/endpointslice |       - staging/src/k8s.io/endpointslice | ||||||
| recursive-delete-patterns: | recursive-delete-patterns: | ||||||
| - '*/.gitattributes' | - '*/.gitattributes' | ||||||
| default-go-version: 1.21.6 | default-go-version: 1.22 | ||||||
|   | |||||||
| @@ -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.22rc2 | GOLANG_VERSION=1.22 | ||||||
| export | export | ||||||
|  |  | ||||||
| ifndef WHAT | ifndef WHAT | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 cpanato
					cpanato