Merge pull request #119368 from xmudrii/go1206-1.25

[release-1.25] releng/go: Bump images, versions and deps to use Go 1.20.6
kubernetes · Jul 17, 2023 · 07bd210 · 07bd210
2 parents eac4b59 + d87b1b9
commit 07bd210
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 35 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.20.5
+1.20.6
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.25.0-go1.20.5-bullseye.0
+v1.25.0-go1.20.6-bullseye.0
diff --git a/build/common.sh b/build/common.sh
@@ -91,7 +91,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.1
-readonly __default_go_runner_version=v2.3.1-go1.20.5-bullseye.0
+readonly __default_go_runner_version=v2.3.1-go1.20.6-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.5
+    version: 1.20.6
     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.25.0-go1.20.5-bullseye.0
+    version: v1.25.0-go1.20.6-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.5-bullseye.0
+    version: v2.3.1-go1.20.6-bullseye.0
     refPaths:
     - path: build/common.sh
       match: __default_go_runner_version=

diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -21,7 +21,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/code-generator
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     source:
       branch: release-1.25
       dir: staging/src/k8s.io/code-generator
@@ -47,7 +47,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/apimachinery
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     source:
       branch: release-1.25
       dir: staging/src/k8s.io/apimachinery
@@ -86,7 +86,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/api
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -152,7 +152,7 @@ rules:
       go build -mod=mod ./...
       go test -mod=mod ./...
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -216,7 +216,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/component-base
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -278,7 +278,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/component-helpers
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -348,7 +348,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/apiserver
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -436,7 +436,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/kube-aggregator
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -547,7 +547,7 @@ rules:
       # assumes GO111MODULE=on
       go build -mod=mod .
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -647,7 +647,7 @@ rules:
       # assumes GO111MODULE=on
       go build -mod=mod .
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -747,7 +747,7 @@ rules:
     required-packages:
     - k8s.io/code-generator
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -824,7 +824,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/metrics
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -888,7 +888,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/cli-runtime
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: api
       branch: release-1.25
@@ -958,7 +958,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/sample-cli-plugin
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: api
       branch: release-1.25
@@ -1029,7 +1029,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/kube-proxy
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -1101,7 +1101,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/kubelet
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -1173,7 +1173,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/kube-scheduler
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -1253,7 +1253,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/controller-manager
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: api
       branch: release-1.25
@@ -1351,7 +1351,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/cloud-provider
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: api
       branch: release-1.25
@@ -1461,7 +1461,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/kube-controller-manager
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -1525,7 +1525,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/cluster-bootstrap
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: apimachinery
       branch: release-1.25
@@ -1577,7 +1577,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/csi-translation-lib
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: api
       branch: release-1.25
@@ -1609,7 +1609,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/mount-utils
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     source:
       branch: release-1.25
       dir: staging/src/k8s.io/mount-utils
@@ -1720,7 +1720,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/legacy-cloud-providers
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: api
       branch: release-1.25
@@ -1768,7 +1768,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/cri-api
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     source:
       branch: release-1.25
       dir: staging/src/k8s.io/cri-api
@@ -1863,7 +1863,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/kubectl
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: api
       branch: release-1.25
@@ -1951,7 +1951,7 @@ rules:
       branch: release-1.24
       dir: staging/src/k8s.io/pod-security-admission
   - name: release-1.25
-    go: 1.20.5
+    go: 1.20.6
     dependencies:
     - repository: api
       branch: release-1.25
@@ -1974,4 +1974,4 @@ recursive-delete-patterns:
 - '*/BUILD.bazel'
 - Gopkg.toml
 - '*/.gitattributes'
-default-go-version: 1.20.5
+default-go-version: 1.20.6
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.5
+GOLANG_VERSION=1.20.6
 export
 
 ifndef WHAT