Merge pull request kubernetes#119804 from jeremyrickard/go1207

[go] Bump images, versions and deps to use Go 1.20.7
openshift · Aug 8, 2023 · 815b18a · 815b18a
2 parents 1620473 + ae86051
commit 815b18a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.20.6
+1.20.7
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.27.0-go1.20.6-bullseye.0
+v1.27.0-go1.20.7-bullseye.0
diff --git 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.2.6
-readonly __default_go_runner_version=v2.3.1-go1.20.6-bullseye.0
+readonly __default_go_runner_version=v2.3.1-go1.20.7-bullseye.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
@@ -55,7 +55,7 @@ dependencies:
 
   # protoc
   - name: "protoc"
-    version: 3.19.4
+    version: 23.4
     refPaths:
     - path: hack/lib/protoc.sh
       match: PROTOC_VERSION=
@@ -114,7 +114,7 @@ dependencies:
 
   # Golang
   - name: "golang: upstream version"
-    version: 1.20.6
+    version: 1.20.7
     refPaths:
     - path: .go-version
     - path: build/build-image/cross/VERSION
@@ -136,7 +136,7 @@ dependencies:
       match: minimum_go_version=go([0-9]+\.[0-9]+)
 
   - name: "registry.k8s.io/kube-cross: dependents"
-    version: v1.27.0-go1.20.6-bullseye.0
+    version: v1.27.0-go1.20.7-bullseye.0
     refPaths:
     - path: build/build-image/cross/VERSION
 
@@ -166,7 +166,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.6-bullseye.0
+    version: v2.3.1-go1.20.7-bullseye.0
     refPaths:
     - path: build/common.sh
       match: __default_go_runner_version=

diff --git a/hack/lib/protoc.sh b/hack/lib/protoc.sh
@@ -25,7 +25,7 @@ set -o pipefail
 KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
-PROTOC_VERSION=3.19.4
+PROTOC_VERSION=23.4
 
 # Generates $1/api.pb.go from the protobuf file $1/api.proto
 # and formats it correctly

diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -2570,4 +2570,4 @@ rules:
       dir: staging/src/k8s.io/endpointslice
 recursive-delete-patterns:
 - '*/.gitattributes'
-default-go-version: 1.20.6
+default-go-version: 1.20.7
diff --git 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.20.6
+GOLANG_VERSION=1.20.7
 export
 
 ifndef WHAT