From b17427acf4f25fdeec9c8ce227a85e8db1ccc30a Mon Sep 17 00:00:00 2001
From: Sunjay Bhatia <sunjayb@vmware.com>
Date: Mon, 12 Feb 2024 11:17:09 -0500
Subject: [PATCH] Bump golang to 1.22.0

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

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_daily.yaml b/.github/workflows/build_daily.yaml
index 51e0243a0d6..ecf15237aa4 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.21.6
+  GO_VERSION: 1.22.0
 
 jobs:
   e2e-envoy-xds:
diff --git a/.github/workflows/build_tag.yaml b/.github/workflows/build_tag.yaml
index f4e250ed0f1..c53f4fd0991 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.21.6
+  GO_VERSION: 1.22.0
 
 jobs:
   build:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5c682d12a76..6c1bf6302cf 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.21.6
+  GO_VERSION: 1.22.0
 
 jobs:
   CodeQL-Build:
diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml
index 2e4d757838f..07bf64dc358 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.21.6
+  GO_VERSION: 1.22.0
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index a6c1a796440..8fd59a521ac 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.21.6@sha256:acab8ef05990e50fe0bc8446398d93d91fa89b3608661529dbd6744b77fcea90
+BUILD_BASE_IMAGE ?= golang:1.22.0@sha256:53048e8f87cb42d5dfb620423479e1acf2d178038c77c61b97ed5d4165e574dc
 
 # Enable build with CGO.
 BUILD_CGO_ENABLED ?= 0