From 7042071fd9c6b27a50ceff2ae65cf39802cdfd4e Mon Sep 17 00:00:00 2001
From: Steve Kriss <stephen.kriss@gmail.com>
Date: Tue, 9 Apr 2024 09:38:48 -0600
Subject: [PATCH] bump Go to 1.22.2 (#6327)

Signed-off-by: Steve Kriss <stephen.kriss@gmail.com>
---
 .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/6265-sunjayBhatia-small.md | 1 -
 changelogs/unreleased/6327-skriss-small.md       | 1 +
 7 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 changelogs/unreleased/6265-sunjayBhatia-small.md
 create mode 100644 changelogs/unreleased/6327-skriss-small.md

diff --git a/.github/workflows/build_daily.yaml b/.github/workflows/build_daily.yaml
index 02352e572e6..2479dfcab06 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.1
+  GO_VERSION: 1.22.2
 
 jobs:
   e2e-contour-xds:
diff --git a/.github/workflows/build_tag.yaml b/.github/workflows/build_tag.yaml
index 5512a15626f..6452a4eadce 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.1
+  GO_VERSION: 1.22.2
 
 jobs:
   build:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 36fdfc994d5..1f74fe4d522 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.1
+  GO_VERSION: 1.22.2
 
 jobs:
   CodeQL-Build:
diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml
index 698c6c362bd..2b012f55caa 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.1
+  GO_VERSION: 1.22.2
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 76427d5d822..211ac74d269 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.1@sha256:34ce21a9696a017249614876638ea37ceca13cdd88f582caad06f87a8aa45bf3
+BUILD_BASE_IMAGE ?= golang:1.22.2@sha256:c4fb952e712efd8f787bcd8e53fd66d1d83b7dc26adabc218e9eac1dbf776bdf
 
 # Enable build with CGO.
 BUILD_CGO_ENABLED ?= 0
diff --git a/changelogs/unreleased/6265-sunjayBhatia-small.md b/changelogs/unreleased/6265-sunjayBhatia-small.md
deleted file mode 100644
index 4da8bf71353..00000000000
--- a/changelogs/unreleased/6265-sunjayBhatia-small.md
+++ /dev/null
@@ -1 +0,0 @@
-Updates to Go 1.22.1. See the [Go release notes](https://go.dev/doc/devel/release#go1.22.minor) for more information.
diff --git a/changelogs/unreleased/6327-skriss-small.md b/changelogs/unreleased/6327-skriss-small.md
new file mode 100644
index 00000000000..e91daa78e17
--- /dev/null
+++ b/changelogs/unreleased/6327-skriss-small.md
@@ -0,0 +1 @@
+Updates to Go 1.22.2. See the [Go release notes](https://go.dev/doc/devel/release#go1.22.minor) for more information.