Merge pull request kubernetes#119830 from jeremyrickard/1207-1.26

[release-1.26] releng/go: Bump images, versions and deps to use Go 1.20.7
openshift · Aug 8, 2023 · 1171161 · 1171161
2 parents b93a5b8 + e791a3f
commit 1171161
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 56 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.26.0-go1.20.6-bullseye.0
+v1.26.0-go1.20.7-bullseye.0
diff --git a/build/common.sh b/build/common.sh
@@ -96,7 +96,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.1.2
-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=bullseye-v1.3.0
 
 # These are the base images for the Docker-wrapped binaries.

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
@@ -88,7 +88,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
@@ -112,7 +112,7 @@ dependencies:
     #  match: minimum_go_version=go([0-9]+\.[0-9]+)
 
   - name: "registry.k8s.io/kube-cross: dependents"
-    version: v1.26.0-go1.20.6-bullseye.0
+    version: v1.26.0-go1.20.7-bullseye.0
     refPaths:
     - path: build/build-image/cross/VERSION
 
@@ -142,7 +142,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
@@ -22,6 +22,7 @@ set -o pipefail
 KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
+
 # Generates $1/api.pb.go from the protobuf file $1/api.proto
 # and formats it correctly
 # $1: Full path to the directory where the api.proto file is
@@ -36,11 +37,11 @@ function kube::protoc::generate_proto() {
   kube::protoc::format "${package}"
 }
 
-# Checks that the current protoc version is at least version 3.0.0-beta1
+# Checks that the current protoc version matches the required version and
 # exit 1 if it's not the case
 function kube::protoc::check_protoc() {
-  if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
-    echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"
+  if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 23.4"* ]]; then
+    echo "Generating protobuf requires protoc 23.4 or newer. Please download and"
     echo "install the platform appropriate Protobuf package for your OS: "
     echo
     echo "  https://github.com/protocolbuffers/protobuf/releases"

diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh
@@ -31,14 +31,14 @@ kube::golang::setup_env
 GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf
 GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
-if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
-  echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"
-  echo "install the platform appropriate Protobuf package for your OS: "
-  echo
-  echo "  https://github.com/protocolbuffers/protobuf/releases"
-  echo
-  echo "WARNING: Protobuf changes are not being validated"
-  exit 1
+if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 23.4"* ]]; then
+	echo "Generating protobuf requires protoc 23.4 or newer. Please download and"
+    echo "install the platform appropriate Protobuf package for your OS: "
+    echo
+    echo "  https://github.com/protocolbuffers/protobuf/releases"
+    echo
+    echo "WARNING: Protobuf changes are not being validated"
+    exit 1
 fi
 
 gotoprotobuf=$(kube::util::find-binary "go-to-protobuf")

diff --git a/hack/update-generated-runtime-dockerized.sh b/hack/update-generated-runtime-dockerized.sh
@@ -31,14 +31,14 @@ kube::golang::setup_env
 
 GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
-if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
-  echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"
-  echo "install the platform appropriate Protobuf package for your OS: "
-  echo
-  echo "  https://github.com/protocolbuffers/protobuf/releases"
-  echo
-  echo "WARNING: Protobuf changes are not being validated"
-  exit 1
+if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 23.4"* ]]; then
+	echo "Generating protobuf requires protoc 23.4 or newer. Please download and"
+    echo "install the platform appropriate Protobuf package for your OS: "
+    echo
+    echo "  https://github.com/protocolbuffers/protobuf/releases"
+    echo
+    echo "WARNING: Protobuf changes are not being validated"
+    exit 1
 fi
 
 function cleanup {

diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -26,7 +26,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/code-generator
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     source: 
       branch: release-1.26
       dir: staging/src/k8s.io/code-generator
@@ -57,7 +57,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/apimachinery
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     source: 
       branch: release-1.26
       dir: staging/src/k8s.io/apimachinery
@@ -104,7 +104,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/api
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -184,7 +184,7 @@ rules:
       go build -mod=mod ./...
       go test -mod=mod ./...
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -260,7 +260,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/component-base
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -334,7 +334,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/component-helpers
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -354,7 +354,7 @@ rules:
       branch: master
       dir: staging/src/k8s.io/kms
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     source:
       branch: release-1.26
       dir: staging/src/k8s.io/kms
@@ -432,7 +432,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/apiserver
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -542,7 +542,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/kube-aggregator
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -680,7 +680,7 @@ rules:
       # assumes GO111MODULE=on
       go build -mod=mod .
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -801,7 +801,7 @@ rules:
       # assumes GO111MODULE=on
       go build -mod=mod .
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -923,7 +923,7 @@ rules:
     required-packages:
     - k8s.io/code-generator
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -1016,7 +1016,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/metrics
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -1092,7 +1092,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/cli-runtime
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: api
       branch: release-1.26
@@ -1176,7 +1176,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/sample-cli-plugin
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: api
       branch: release-1.26
@@ -1261,7 +1261,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/kube-proxy
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -1347,7 +1347,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/kubelet
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -1433,7 +1433,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/kube-scheduler
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -1531,7 +1531,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/controller-manager
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: api
       branch: release-1.26
@@ -1653,7 +1653,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/cloud-provider
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: api
       branch: release-1.26
@@ -1789,7 +1789,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/kube-controller-manager
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -1865,7 +1865,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/cluster-bootstrap
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: apimachinery
       branch: release-1.26
@@ -1927,7 +1927,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/csi-translation-lib
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: api
       branch: release-1.26
@@ -1964,7 +1964,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/mount-utils
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     source:
       branch: release-1.26
       dir: staging/src/k8s.io/mount-utils
@@ -2101,7 +2101,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/legacy-cloud-providers
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: api
       branch: release-1.26
@@ -2156,7 +2156,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/cri-api
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     source:
       branch: release-1.26
       dir: staging/src/k8s.io/cri-api
@@ -2273,7 +2273,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/kubectl
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: api
       branch: release-1.26
@@ -2379,7 +2379,7 @@ rules:
       branch: release-1.25
       dir: staging/src/k8s.io/pod-security-admission
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
     - repository: api
       branch: release-1.26
@@ -2415,7 +2415,7 @@ rules:
       branch: master
       dir: staging/src/k8s.io/dynamic-resource-allocation
   - name: release-1.26
-    go: 1.20.6
+    go: 1.20.7
     dependencies:
       - repository: apimachinery
         branch: release-1.26
@@ -2432,4 +2432,4 @@ rules:
       dir: staging/src/k8s.io/dynamic-resource-allocation
 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