From 0eb290e13658596e6a9456dd757b271f4e3e3f1e Mon Sep 17 00:00:00 2001
From: Jakub Bednar <jakub.bednar@gmail.com>
Date: Thu, 9 May 2024 11:18:22 +0200
Subject: [PATCH 1/3] chore(build): upgrade Go to 1.21.10

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc9c912d81..65d970d802 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,7 +72,7 @@ workflows:
 jobs:
   build:
     environment:
-      DOCKER_TAG: chronograf-20240416
+      DOCKER_TAG: chronograf-20240509
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -96,7 +96,7 @@ jobs:
 
   deploy-nightly:
     environment:
-      DOCKER_TAG: chronograf-20240416
+      DOCKER_TAG: chronograf-20240509
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -125,7 +125,7 @@ jobs:
 
   deploy-pre-release:
     environment:
-      DOCKER_TAG: chronograf-20240416
+      DOCKER_TAG: chronograf-20240509
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -160,7 +160,7 @@ jobs:
 
   deploy-release:
     environment:
-      DOCKER_TAG: chronograf-20240416
+      DOCKER_TAG: chronograf-20240509
       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 9405cebf87..00146a58af 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.9'
+          go-version: '1.21.10'
 
       - uses: actions/setup-node@v2
         with:
diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build
index 04c0a50b49..e2a68e07ce 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.9
+ENV GO_VERSION 1.21.10
 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 7e21a61286..8efd81c674 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-20240416"
+test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240509"
 
 docker run \
        -e AWS_ACCESS_KEY_ID \

From b6942f48a9153b123befe0386d5c91332d888d10 Mon Sep 17 00:00:00 2001
From: Jakub Bednar <jakub.bednar@gmail.com>
Date: Thu, 9 May 2024 11:43:14 +0200
Subject: [PATCH 2/3] docs: update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24b8bf3777..0a18e56d36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [unreleased]
 
+### Other
+
+1. [#6094](https://github.com/influxdata/chronograf/pull/6094): Upgrade golang to 1.21.10.
+
 ## v1.10.4 [2024-04-25]
 
 ### Other

From 8bbdca5cda14433185e90bc852d9bc90b4af6ffe Mon Sep 17 00:00:00 2001
From: Jakub Bednar <jakub.bednar@gmail.com>
Date: Thu, 9 May 2024 11:43:39 +0200
Subject: [PATCH 3/3] chore(ci): use platform corresponding with CI

---
 etc/scripts/docker/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/scripts/docker/build.sh b/etc/scripts/docker/build.sh
index 11a02fcb61..b6206315da 100755
--- a/etc/scripts/docker/build.sh
+++ b/etc/scripts/docker/build.sh
@@ -3,7 +3,7 @@ set -x
 
 DOCKER_TAG="chronograf-$(date +%Y%m%d)"
 
-docker build --rm=false -f etc/Dockerfile_build -t builder:$DOCKER_TAG .
+docker build --rm=false --platform linux/amd64 -f etc/Dockerfile_build -t builder:$DOCKER_TAG .
 docker tag builder:$DOCKER_TAG quay.io/influxdb/builder:$DOCKER_TAG
 
 docker push quay.io/influxdb/builder:$DOCKER_TAG