From 4bda9697eeab7669c3af43aef75a6164bcdeb788 Mon Sep 17 00:00:00 2001
From: Carlos Panato <ctadeu@gmail.com>
Date: Fri, 10 Dec 2021 16:58:29 +0100
Subject: [PATCH] [go1.17] Update to go1.17.5

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

diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index 610b2435fab..8a4303d7a39 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.24.0-go1.17.4-bullseye.0
+v1.24.0-go1.17.5-bullseye.0
diff --git a/build/common.sh b/build/common.sh
index 36638b8c0f4..99c0f2d4635 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.1.0
-readonly __default_go_runner_version=v2.3.1-go1.17.4-bullseye.0
+readonly __default_go_runner_version=v2.3.1-go1.17.5-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 8e4ed0dc977..d7a444a7662 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -87,7 +87,7 @@ dependencies:
 
   # Golang
   - name: "golang: upstream version"
-    version: 1.17.4
+    version: 1.17.5
     refPaths:
     - path: build/build-image/cross/VERSION
     - path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@@ -110,13 +110,13 @@ dependencies:
       match: minimum_go_version=go([0-9]+\.[0-9]+)
 
   - name: "golang: etcd release version"
-    version: 1.16.11
+    version: 1.16.12
     refPaths:
     - path: cluster/images/etcd/Makefile
       match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
 
   - name: "k8s.gcr.io/kube-cross: dependents"
-    version: v1.24.0-go1.17.4-bullseye.0
+    version: v1.24.0-go1.17.5-bullseye.0
     refPaths:
     - path: build/build-image/cross/VERSION
 
@@ -146,7 +146,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.4-bullseye.0
+    version: v2.3.1-go1.17.5-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 288e89ce83e..9ef2cff809c 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.4 AS builder
+FROM golang:1.17.5 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 1e7c66ebf8f..a1dc398620d 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.11
+GOLANG_VERSION?=1.16.12
 GOARM?=7
 TEMP_DIR:=$(shell mktemp -d)
 
diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
index 40d6c2bd333..4a1115a8f74 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.4
+default-go-version: 1.17.5
 rules:
 - destination: code-generator
   branches:
diff --git a/test/images/Makefile b/test/images/Makefile
index 631e3eb8d67..cb9423c606e 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.4
+GOLANG_VERSION=1.17.5
 export
 
 ifndef WHAT