Bump go to 1.21.6 (#6070)

See release notes: https://go.dev/doc/devel/release#go1.21.0 Uses sha for golang image to pin it to an exact version May help with test race issues that cropped up recently Signed-off-by: Sunjay Bhatia <[email protected]>
projectcontour · Jan 11, 2024 · 838bad4 · 838bad4
1 parent 16fa671
commit 838bad4
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_daily.yaml b/.github/workflows/build_daily.yaml
@@ -10,7 +10,7 @@ on:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.21.5
+  GO_VERSION: 1.21.6
 jobs:
   e2e-envoy-xds:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build_tag.yaml b/.github/workflows/build_tag.yaml
@@ -15,7 +15,7 @@ on:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.21.5
+  GO_VERSION: 1.21.6
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   GOPROXY: https://proxy.golang.org/
-  GO_VERSION: 1.21.5
+  GO_VERSION: 1.21.6
 jobs:
   CodeQL-Build:
 

diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml
@@ -11,7 +11,7 @@ on:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.21.5
+  GO_VERSION: 1.21.6
 jobs:
   lint:
     runs-on: ubuntu-latest

diff --git 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.5
+BUILD_BASE_IMAGE ?= golang:1.21.6@sha256:acab8ef05990e50fe0bc8446398d93d91fa89b3608661529dbd6744b77fcea90
 
 # Enable build with CGO.
 BUILD_CGO_ENABLED ?= 0

diff --git a/changelogs/unreleased/6053-sunjayBhatia-small.md b/changelogs/unreleased/6053-sunjayBhatia-small.md
diff --git a/changelogs/unreleased/6070-sunjayBhatia-small.md b/changelogs/unreleased/6070-sunjayBhatia-small.md
@@ -0,0 +1 @@
+Updates to Go 1.21.6. See the [Go release notes](https://go.dev/doc/devel/release#go1.21.minor) for more information.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Updates to Go 1.21.6. See the [Go release notes](https://go.dev/doc/devel/release#go1.21.minor) for more information.