From 67858e1ff065da0e29839826ed8cee5dacf48fb6 Mon Sep 17 00:00:00 2001 From: cpanato Date: Fri, 30 Jun 2023 11:08:58 +0200 Subject: [PATCH 1/2] Bump images, dependencies and versions to go 1.21.0 Signed-off-by: cpanato --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- build/dependencies.yaml | 8 ++++---- hack/lib/golang.sh | 2 +- staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.go-version b/.go-version index 6597009a067..e4264e9848d 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.7 \ No newline at end of file +1.21.0 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 48720f3a4b4..e58f958ed99 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.27.0-go1.20.7-bullseye.0 +v1.29.0-go1.21.0-bookworm.0 diff --git a/build/common.sh b/build/common.sh index db7745bb39d..d776ccdfde8 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,7 +97,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_distroless_iptables_version=v0.3.1 -readonly __default_go_runner_version=v2.3.1-go1.20.7-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.21.0-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 4d47fb17bb4..b6ea2abe744 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.20.7 + version: 1.21.0 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -131,14 +131,14 @@ 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. - name: "golang: 1." - version: 1.20 + version: 1.21 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.27.0-go1.20.7-bullseye.0 + version: v1.29.0-go1.21.0-bookworm.0 refPaths: - path: build/build-image/cross/VERSION @@ -168,7 +168,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.20.7-bullseye.0 + version: v2.3.1-go1.21.0-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 983ff368e25..95b25678725 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -486,7 +486,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)" local minimum_go_version - minimum_go_version=go1.20 + 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 kube::log::usage_from_stdin < Date: Wed, 6 Sep 2023 12:06:41 +0200 Subject: [PATCH 2/2] move back to bullseye Signed-off-by: cpanato --- build/build-image/cross/VERSION | 2 +- build/dependencies.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index e58f958ed99..079d2dd1804 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.29.0-go1.21.0-bookworm.0 +v1.29.0-go1.21.0-bullseye.0 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index b6ea2abe744..b20ffbad31b 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -138,7 +138,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.29.0-go1.21.0-bookworm.0 + version: v1.29.0-go1.21.0-bullseye.0 refPaths: - path: build/build-image/cross/VERSION