From 00e7846f8e04778309415aa8c2f024b6e13a4ec4 Mon Sep 17 00:00:00 2001
From: Sunjay Bhatia <5337253+sunjayBhatia@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:03:05 -0400
Subject: [PATCH] Bump go to 1.22.5 (#6563)

See release notes: https://go.dev/doc/devel/release#go1.22.minor

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
Signed-off-by: Geoff Macartney <geoff.macartney@sky.uk>
---
 .github/workflows/build_daily.yaml               | 2 +-
 .github/workflows/build_tag.yaml                 | 2 +-
 .github/workflows/codeql-analysis.yml            | 2 +-
 .github/workflows/prbuild.yaml                   | 2 +-
 Makefile                                         | 2 +-
 changelogs/unreleased/6499-sunjayBhatia-small.md | 1 -
 changelogs/unreleased/6563-sunjayBhatia-small.md | 1 +
 7 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 changelogs/unreleased/6499-sunjayBhatia-small.md
 create mode 100644 changelogs/unreleased/6563-sunjayBhatia-small.md

diff --git a/.github/workflows/build_daily.yaml b/.github/workflows/build_daily.yaml
index fb954f00a20..d67ab9f1dd7 100644
--- a/.github/workflows/build_daily.yaml
+++ b/.github/workflows/build_daily.yaml
@@ -13,7 +13,7 @@ permissions:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.22.4
+  GO_VERSION: 1.22.5
 
 jobs:
   e2e-contour-xds:
diff --git a/.github/workflows/build_tag.yaml b/.github/workflows/build_tag.yaml
index 9a310dff6aa..0fb50b92db3 100644
--- a/.github/workflows/build_tag.yaml
+++ b/.github/workflows/build_tag.yaml
@@ -19,7 +19,7 @@ permissions:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.22.4
+  GO_VERSION: 1.22.5
 
 jobs:
   build:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0cd0731bfdd..ad23330278f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,7 +14,7 @@ permissions:
 
 env:
   GOPROXY: https://proxy.golang.org/
-  GO_VERSION: 1.22.4
+  GO_VERSION: 1.22.5
 
 jobs:
   CodeQL-Build:
diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml
index fb396e9f22a..84e41582141 100644
--- a/.github/workflows/prbuild.yaml
+++ b/.github/workflows/prbuild.yaml
@@ -14,7 +14,7 @@ permissions:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.22.4
+  GO_VERSION: 1.22.5
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 65398978b7f..57cdc9a8ffb 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ endif
 IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
 
 # Base build image to use.
-BUILD_BASE_IMAGE ?= golang:1.22.4@sha256:969349b8121a56d51c74f4c273ab974c15b3a8ae246a5cffc1df7d28b66cf978
+BUILD_BASE_IMAGE ?= golang:1.22.5@sha256:829eff99a4b2abffe68f6a3847337bf6455d69d17e49ec1a97dac78834754bd6
 
 # Enable build with CGO.
 BUILD_CGO_ENABLED ?= 0
diff --git a/changelogs/unreleased/6499-sunjayBhatia-small.md b/changelogs/unreleased/6499-sunjayBhatia-small.md
deleted file mode 100644
index 18b7ccd3baa..00000000000
--- a/changelogs/unreleased/6499-sunjayBhatia-small.md
+++ /dev/null
@@ -1 +0,0 @@
-Updates to Go 1.22.4. See the [Go release notes](https://go.dev/doc/devel/release#go1.22.minor) for more information.
diff --git a/changelogs/unreleased/6563-sunjayBhatia-small.md b/changelogs/unreleased/6563-sunjayBhatia-small.md
new file mode 100644
index 00000000000..90e2b29a3f3
--- /dev/null
+++ b/changelogs/unreleased/6563-sunjayBhatia-small.md
@@ -0,0 +1 @@
+Updates to Go 1.22.5. See the [Go release notes](https://go.dev/doc/devel/release#go1.22.minor) for more information.