From d2049db6035d4c11529c430b3638fa5ad6209077 Mon Sep 17 00:00:00 2001
From: alespour <42931850+alespour@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:59:30 +0200
Subject: [PATCH] chore(build): upgrade Go to 1.21.9 (#6090)

---
 .circleci/config.yml                            | 8 ++++----
 .github/workflows/chronograf-cypress-tests.yaml | 2 +-
 CHANGELOG.md                                    | 2 +-
 etc/Dockerfile_build                            | 2 +-
 etc/scripts/docker/run.sh                       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f61285433e..a874d215ad 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,7 +72,7 @@ workflows:
 jobs:
   build:
     environment:
-      DOCKER_TAG: chronograf-20240320
+      DOCKER_TAG: chronograf-20240416
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -96,7 +96,7 @@ jobs:
 
   deploy-nightly:
     environment:
-      DOCKER_TAG: chronograf-20240320
+      DOCKER_TAG: chronograf-20240416
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -125,7 +125,7 @@ jobs:
 
   deploy-pre-release:
     environment:
-      DOCKER_TAG: chronograf-20240320
+      DOCKER_TAG: chronograf-20240416
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -160,7 +160,7 @@ jobs:
 
   deploy-release:
     environment:
-      DOCKER_TAG: chronograf-20240320
+      DOCKER_TAG: chronograf-20240416
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml
index a65af86e53..9405cebf87 100644
--- a/.github/workflows/chronograf-cypress-tests.yaml
+++ b/.github/workflows/chronograf-cypress-tests.yaml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.21.8'
+          go-version: '1.21.9'
 
       - uses: actions/setup-node@v2
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2f6c7d2ac..25a6a6acb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### Other
 
-1. [#6085](https://github.com/influxdata/chronograf/pull/6085): Upgrade golang to 1.21.8.
+1. [#6090](https://github.com/influxdata/chronograf/pull/6090): Upgrade golang to 1.21.9.
 
 ## v1.10.3 [2024-02-28]
 
diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build
index f68f91a45b..04c0a50b49 100644
--- a/etc/Dockerfile_build
+++ b/etc/Dockerfile_build
@@ -34,7 +34,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
 
 # Install go
 ENV GOPATH /root/go
-ENV GO_VERSION 1.21.8
+ENV GO_VERSION 1.21.9
 ENV GO_ARCH amd64
 ENV GO111MODULES ON
 RUN wget https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
diff --git a/etc/scripts/docker/run.sh b/etc/scripts/docker/run.sh
index 6acd155471..7e21a61286 100755
--- a/etc/scripts/docker/run.sh
+++ b/etc/scripts/docker/run.sh
@@ -14,7 +14,7 @@ test -z $SSH_KEY_PATH && SSH_KEY_PATH="$HOME/.ssh/id_rsa"
 echo "Using SSH key located at: $SSH_KEY_PATH"
 
 # Default docker tag if not specified
-test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240320"
+test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240416"
 
 docker run \
        -e AWS_ACCESS_KEY_ID \