From 475b0f5f6aa5b7a74665567500535ff488e88469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= <jakub.bednar@gmail.com>
Date: Wed, 10 Jul 2024 18:04:11 +0200
Subject: [PATCH] chore(build): upgrade Go to 1.21.12 (#6102)

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65d970d802..b2c7185406 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,7 +72,7 @@ workflows:
 jobs:
   build:
     environment:
-      DOCKER_TAG: chronograf-20240509
+      DOCKER_TAG: chronograf-20240710
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -96,7 +96,7 @@ jobs:
 
   deploy-nightly:
     environment:
-      DOCKER_TAG: chronograf-20240509
+      DOCKER_TAG: chronograf-20240710
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -125,7 +125,7 @@ jobs:
 
   deploy-pre-release:
     environment:
-      DOCKER_TAG: chronograf-20240509
+      DOCKER_TAG: chronograf-20240710
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -160,7 +160,7 @@ jobs:
 
   deploy-release:
     environment:
-      DOCKER_TAG: chronograf-20240509
+      DOCKER_TAG: chronograf-20240710
       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 00146a58af..dd9f6228e9 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.10'
+          go-version: '1.21.12'
 
       - uses: actions/setup-node@v2
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b0206a853..c264ebbbc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [unreleased]
 
+### Other
+
+1. [#6102](https://github.com/influxdata/chronograf/pull/6102): Upgrade golang to 1.21.12.
+
 ## v1.10.5 [2024-05-31]
 
 ### Other
diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build
index e2a68e07ce..b59ca9cedf 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.10
+ENV GO_VERSION 1.21.12
 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 8efd81c674..99296fa42d 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-20240509"
+test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240710"
 
 docker run \
        -e AWS_ACCESS_KEY_ID \