From d2aec61e0d1aa96a83ec14ff0a083ba92ec44c47 Mon Sep 17 00:00:00 2001
From: Chun-Hung Tseng <henrybear327@gmail.com>
Date: Thu, 4 Apr 2024 10:06:08 +0200
Subject: [PATCH] Bump go-version to 1.21.9 for release-3.4 due to
 CVE-2023-45288

Reference:
- PR #17703
---
 .go-version                               | 2 +-
 Makefile                                  | 2 +-
 functional/scripts/docker-local-agent.sh  | 2 +-
 functional/scripts/docker-local-tester.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.go-version b/.go-version
index 428abfd24fbe..f124bfa15544 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.8
+1.21.9
diff --git a/Makefile b/Makefile
index 958a7ba9a0eb..62567d99908e 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ docker-remove:
 
 
 
-GO_VERSION ?= 1.21.8
+GO_VERSION ?= 1.21.9
 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
 
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh
index 84e6f2140841..e4a9576e920b 100755
--- a/functional/scripts/docker-local-agent.sh
+++ b/functional/scripts/docker-local-agent.sh
@@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
 fi
 
 if [[ -z "${GO_VERSION}" ]]; then
-  GO_VERSION=1.21.8
+  GO_VERSION=1.21.9
 fi
 echo "Running with GO_VERSION:" ${GO_VERSION}
 
diff --git a/functional/scripts/docker-local-tester.sh b/functional/scripts/docker-local-tester.sh
index 6b0303f91308..7abe83e26735 100755
--- a/functional/scripts/docker-local-tester.sh
+++ b/functional/scripts/docker-local-tester.sh
@@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
 fi
 
 if [[ -z "${GO_VERSION}" ]]; then
-  GO_VERSION=1.21.8
+  GO_VERSION=1.21.9
 fi
 echo "Running with GO_VERSION:" ${GO_VERSION}