From 057d150bee8ca27156cc703b3903a455682e949f Mon Sep 17 00:00:00 2001
From: Bernie Birnbaum <bewebi@earthlink.net>
Date: Thu, 6 Mar 2025 13:04:46 -0500
Subject: [PATCH] [1.18] Bump Go to 1.23.7 (#10683)

---
 changelog/v1.17.26/go-bump-1.23.7.yaml |  8 ++++++++
 ci/cloudbuild/publish-artifacts.yaml   |  8 ++++----
 ci/cloudbuild/run-tests.yaml           | 12 ++++++------
 cloudbuild-cache.yaml                  |  2 +-
 go.mod                                 |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 changelog/v1.17.26/go-bump-1.23.7.yaml

diff --git a/changelog/v1.17.26/go-bump-1.23.7.yaml b/changelog/v1.17.26/go-bump-1.23.7.yaml
new file mode 100644
index 00000000000..a1d4e19dc16
--- /dev/null
+++ b/changelog/v1.17.26/go-bump-1.23.7.yaml
@@ -0,0 +1,8 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    description: Bump Go version to 1.23.7
+    dependencyOwner: golang
+    dependencyRepo: go
+    dependencyTag: v1.23.7
+    issueLink: https://github.com/solo-io/solo-projects/issues/7958
+    resolvesIssue: false
\ No newline at end of file
diff --git a/ci/cloudbuild/publish-artifacts.yaml b/ci/cloudbuild/publish-artifacts.yaml
index d36e9c10c50..e08351adc0a 100644
--- a/ci/cloudbuild/publish-artifacts.yaml
+++ b/ci/cloudbuild/publish-artifacts.yaml
@@ -1,6 +1,6 @@
 steps:
 
-- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.11.2'
   id: 'prepare-workspace'
   args:
   - '--repo-name'
@@ -44,7 +44,7 @@ steps:
   - 'us-central1-a'
 
 # Run make targets to push docker images to quay.io
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.2'
   id: 'publish-docker'
   args:
   - 'publish-docker'
@@ -65,7 +65,7 @@ steps:
   waitFor:
   - 'publish-docker'
 
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.2'
   id: 'release-chart'
   dir: *dir
   args:
@@ -80,7 +80,7 @@ steps:
   - 'gcr-auth'
 
 # Run make targets to retag and push docker images to GCR
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.2'
   id: 'docker-push-extended-gcr'
   dir: *dir
   args:
diff --git a/ci/cloudbuild/run-tests.yaml b/ci/cloudbuild/run-tests.yaml
index 1f7fb0a3712..ce774b83c8b 100644
--- a/ci/cloudbuild/run-tests.yaml
+++ b/ci/cloudbuild/run-tests.yaml
@@ -1,6 +1,6 @@
 steps:
 
-- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.11.2'
   id: 'prepare-workspace'
   args:
   - '--repo-name'
@@ -23,7 +23,7 @@ steps:
     cd /go/pkg
     gsutil cat gs://$PROJECT_ID-cache/gloo/gloo-mod.tar.gz | tar -xzf - || echo "untar mod cache failed; continuing because we can download deps as we need them"
 
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.2'
   id: 'prepare-envoy'
   dir: *dir
   entrypoint: 'bash'
@@ -77,7 +77,7 @@ steps:
   waitFor:
   - 'prepare-gcr-zone'
 
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.2'
   id: 'prepare-test-tools'
   dir: *dir
   args:
@@ -88,7 +88,7 @@ steps:
   - 'prepare-gcr-zone'
   - 'prepare-test-credentials'
 
-- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.2'
   id: 'run-tests'
   dir: *dir
   entrypoint: 'make'
@@ -99,7 +99,7 @@ steps:
   secretEnv:
   - 'JWT_PRIVATE_KEY'
 
-- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.2'
   id: 'run-e2e-tests'
   dir: *dir
   entrypoint: 'make'
@@ -110,7 +110,7 @@ steps:
   secretEnv:
   - 'JWT_PRIVATE_KEY'
 
-- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.2'
   id: 'run-hashicorp-e2e-tests'
   dir: *dir
   entrypoint: 'make'
diff --git a/cloudbuild-cache.yaml b/cloudbuild-cache.yaml
index a7eeea41fb8..91945806ae7 100644
--- a/cloudbuild-cache.yaml
+++ b/cloudbuild-cache.yaml
@@ -1,6 +1,6 @@
 options:
   env:
-    - "_GO_VERSION=1.23.3"
+    - "_GO_VERSION=1.23.7"
 
 steps:
 - name: gcr.io/cloud-builders/gsutil
diff --git a/go.mod b/go.mod
index 141a577075a..5467af500f8 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/solo-io/gloo
 
-go 1.23.3
+go 1.23.7
 
 // Note for developers: upgrading go will also require upgrading go in the following files:
 // ./cloudbuild-cache.yaml,