From abbf8c3bed2556e22ef1934b1e1e9a218cc9f9e7 Mon Sep 17 00:00:00 2001
From: Carlos Panato <ctadeu@gmail.com>
Date: Sun, 7 Nov 2021 16:29:35 +0100
Subject: [PATCH] [go1.17] Update to go1.17.3

Signed-off-by: Carlos Panato <ctadeu@gmail.com>
---
 build/build-image/cross/VERSION               |   2 +-
 build/common.sh                               |   2 +-
 build/dependencies.yaml                       |   8 +-
 .../fluentd-elasticsearch/es-image/Dockerfile |   2 +-
 cluster/images/etcd/Makefile                  |   2 +-
 staging/publishing/rules.yaml                 | 108 +++++++++---------
 test/images/Makefile                          |   2 +-
 7 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index f54e31c8680..bfe07711824 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.23.0-go1.17.2-bullseye.0
+v1.23.0-go1.17.3-bullseye.0
diff --git a/build/common.sh b/build/common.sh
index 770769f3a17..845724f9246 100755
--- 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_debian_iptables_version=bullseye-v1.0.0
-readonly __default_go_runner_version=v2.3.1-go1.17.2-bullseye.0
+readonly __default_go_runner_version=v2.3.1-go1.17.3-bullseye.0
 readonly __default_setcap_version=bullseye-v1.0.0
 
 # These are the base images for the Docker-wrapped binaries.
diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 4511b702b8a..4d9e4684c35 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -85,7 +85,7 @@ dependencies:
 
   # Golang
   - name: "golang: upstream version"
-    version: 1.17.2
+    version: 1.17.3
     refPaths:
     - path: build/build-image/cross/VERSION
     - path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@@ -108,13 +108,13 @@ dependencies:
       match: minimum_go_version=go([0-9]+\.[0-9]+)
 
   - name: "golang: etcd release version"
-    version: 1.16.9
+    version: 1.16.10
     refPaths:
     - path: cluster/images/etcd/Makefile
       match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
 
   - name: "k8s.gcr.io/kube-cross: dependents"
-    version: v1.23.0-go1.17.2-bullseye.0
+    version: v1.23.0-go1.17.3-bullseye.0
     refPaths:
     - path: build/build-image/cross/VERSION
 
@@ -144,7 +144,7 @@ dependencies:
       match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[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: "k8s.gcr.io/go-runner: dependents"
-    version: v2.3.1-go1.17.2-bullseye.0
+    version: v2.3.1-go1.17.3-bullseye.0
     refPaths:
     - path: build/common.sh
       match: __default_go_runner_version=
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
index 1d7828a7f7a..fdbd17457c6 100644
--- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.17.2 AS builder
+FROM golang:1.17.3 AS builder
 COPY elasticsearch_logging_discovery.go go.mod go.sum /
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go
 
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index 4e96cbbbb87..26cbfdab7d2 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -62,7 +62,7 @@ endif
 # This option is for running docker manifest command
 export DOCKER_CLI_EXPERIMENTAL := enabled
 # golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases.
-GOLANG_VERSION?=1.16.9
+GOLANG_VERSION?=1.16.10
 GOARM?=7
 TEMP_DIR:=$(shell mktemp -d)
 
diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
index e6b8270dd9f..6826c6fed7a 100644
--- a/staging/publishing/rules.yaml
+++ b/staging/publishing/rules.yaml
@@ -7,7 +7,7 @@ recursive-delete-patterns:
 - BUILD.bazel
 - "*/BUILD.bazel"
 - Gopkg.toml
-default-go-version: 1.17.2
+default-go-version: 1.17.3
 rules:
 - destination: code-generator
   branches:
@@ -29,12 +29,12 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/code-generator
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
   - source:
       branch: release-1.22
       dir: staging/src/k8s.io/code-generator
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
 
 - destination: apimachinery
   library: true
@@ -57,12 +57,12 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/apimachinery
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
   - source:
       branch: release-1.22
       dir: staging/src/k8s.io/apimachinery
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
 
 - destination: api
   library: true
@@ -94,7 +94,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/api
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
       - repository: apimachinery
         branch: release-1.21
@@ -102,7 +102,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/api
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -155,7 +155,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/client-go
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
       - repository: apimachinery
         branch: release-1.21
@@ -169,7 +169,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/client-go
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
       - repository: apimachinery
         branch: release-1.22
@@ -222,7 +222,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/component-base
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -234,7 +234,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/component-base
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -273,7 +273,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/component-helpers
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -285,7 +285,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/component-helpers
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -342,7 +342,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/apiserver
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -356,7 +356,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/apiserver
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -426,7 +426,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/kube-aggregator
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -444,7 +444,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/kube-aggregator
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -533,7 +533,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/sample-apiserver
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -556,7 +556,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/sample-apiserver
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -638,7 +638,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/sample-controller
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -657,7 +657,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/sample-controller
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -738,7 +738,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/apiextensions-apiserver
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -758,7 +758,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/apiextensions-apiserver
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -823,7 +823,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/metrics
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -837,7 +837,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/metrics
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -890,7 +890,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/cli-runtime
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.21
@@ -902,7 +902,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/cli-runtime
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.22
@@ -959,7 +959,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/sample-cli-plugin
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.21
@@ -973,7 +973,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/sample-cli-plugin
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.22
@@ -1032,7 +1032,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/kube-proxy
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -1046,7 +1046,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/kube-proxy
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -1105,7 +1105,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/kubelet
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -1119,7 +1119,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/kubelet
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -1178,7 +1178,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/kube-scheduler
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -1192,7 +1192,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/kube-scheduler
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -1246,7 +1246,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/controller-manager
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.21
@@ -1262,7 +1262,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/controller-manager
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.22
@@ -1331,7 +1331,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/cloud-provider
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.21
@@ -1349,7 +1349,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/cloud-provider
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.22
@@ -1424,7 +1424,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/kube-controller-manager
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -1444,7 +1444,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/kube-controller-manager
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -1497,7 +1497,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/cluster-bootstrap
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.21
@@ -1507,7 +1507,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/cluster-bootstrap
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: apimachinery
       branch: release-1.22
@@ -1556,7 +1556,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/csi-translation-lib
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.21
@@ -1566,7 +1566,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/csi-translation-lib
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.22
@@ -1589,12 +1589,12 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/mount-utils
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
   - source:
       branch: release-1.22
       dir: staging/src/k8s.io/mount-utils
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
 
 - destination: legacy-cloud-providers
   library: true
@@ -1668,7 +1668,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/legacy-cloud-providers
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.21
@@ -1690,7 +1690,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/legacy-cloud-providers
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.22
@@ -1732,12 +1732,12 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/cri-api
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
   - source:
       branch: release-1.22
       dir: staging/src/k8s.io/cri-api
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
 
 - destination: kubectl
   library: true
@@ -1809,7 +1809,7 @@ rules:
       branch: release-1.21
       dir: staging/src/k8s.io/kubectl
     name: release-1.21
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.21
@@ -1831,7 +1831,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/kubectl
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.22
@@ -1872,7 +1872,7 @@ rules:
       branch: release-1.22
       dir: staging/src/k8s.io/pod-security-admission
     name: release-1.22
-    go: 1.16.9
+    go: 1.16.9qqq
     dependencies:
     - repository: api
       branch: release-1.22
diff --git a/test/images/Makefile b/test/images/Makefile
index 3aa152e825a..ba57cac6009 100644
--- a/test/images/Makefile
+++ b/test/images/Makefile
@@ -16,7 +16,7 @@ REGISTRY ?= k8s.gcr.io/e2e-test-images
 GOARM ?= 7
 DOCKER_CERT_BASE_PATH ?=
 QEMUVERSION=v5.1.0-2
-GOLANG_VERSION=1.17.2
+GOLANG_VERSION=1.17.3
 export
 
 ifndef WHAT