From 546edaaeff1fb63ed237f7798f3972b708417780 Mon Sep 17 00:00:00 2001
From: Ruben Vargas <ruben.vp8510@gmail.com>
Date: Mon, 16 Oct 2023 04:06:14 -0600
Subject: [PATCH] Bump golang version to 1.21 (#2347)

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
---
 .github/workflows/base-checks.yaml | 2 +-
 .github/workflows/release.yaml     | 2 +-
 Dockerfile                         | 2 +-
 go.mod                             | 2 +-
 hack/actions/e2e/action.yaml       | 2 +-
 tests/Dockerfile                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/base-checks.yaml b/.github/workflows/base-checks.yaml
index 20e68dca3..4cea39d48 100644
--- a/.github/workflows/base-checks.yaml
+++ b/.github/workflows/base-checks.yaml
@@ -19,7 +19,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.20"
+        go-version: "1.21"
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9b875126e..19b9509be 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -14,7 +14,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.20"
+        go-version: "1.21"
 
     - uses: actions/checkout@v3
 
diff --git a/Dockerfile b/Dockerfile
index 222728c6b..a043cb8f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/go.mod b/go.mod
index c3575a925..cd24db23e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/jaegertracing/jaeger-operator
 
-go 1.20
+go 1.21
 
 require (
 	github.com/Masterminds/semver v1.5.0
diff --git a/hack/actions/e2e/action.yaml b/hack/actions/e2e/action.yaml
index 8bc005c51..5b27346e8 100644
--- a/hack/actions/e2e/action.yaml
+++ b/hack/actions/e2e/action.yaml
@@ -23,7 +23,7 @@ runs:
     - name: "Set up Go"
       uses: actions/setup-go@v2.1.4
       with:
-        go-version: "1.20"
+        go-version: "1.21"
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
       with:
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 479c1c0af..9944d9597 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -1,5 +1,5 @@
 # The Dockerfile's resulting image is purpose-built for executing Jaeger Operator e2e tests within the OpenShift release (https://github.com/openshift/release) using Prow CI.
-FROM golang:1.20
+FROM golang:1.21
 
 # Set the user to root
 USER root