From 45c53dc81dbe68de2cdc52ed63ba54e674c7791c Mon Sep 17 00:00:00 2001
From: Eguzki Astiz Lezaun <eastizle@redhat.com>
Date: Wed, 15 Nov 2023 11:22:51 +0100
Subject: [PATCH] Dockerfile and CI manifests: bump go 1.21

Signed-off-by: Eguzki Astiz Lezaun <eastizle@redhat.com>
---
 .github/workflows/build-images-base.yaml |  8 +++----
 .github/workflows/test.yaml              | 28 ++++++++++++------------
 Dockerfile                               |  2 +-
 doc/development.md                       |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build-images-base.yaml b/.github/workflows/build-images-base.yaml
index 64315b60..8e2d9909 100644
--- a/.github/workflows/build-images-base.yaml
+++ b/.github/workflows/build-images-base.yaml
@@ -92,10 +92,10 @@ jobs:
     name: Build Bundle
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -141,10 +141,10 @@ jobs:
     needs: [build, build-bundle]
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 9d24e4d9..a2f74b36 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -14,10 +14,10 @@ jobs:
       run:
         shell: bash
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - uses: actions/checkout@v3
       - name: Run make test-unit
@@ -37,10 +37,10 @@ jobs:
       run:
         shell: bash
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -68,10 +68,10 @@ jobs:
     name: Verify manifests
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - uses: actions/checkout@v3
       - name: Verify manifests
@@ -80,10 +80,10 @@ jobs:
     name: Verify bundle
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -94,10 +94,10 @@ jobs:
     name: Verify fmt
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -108,10 +108,10 @@ jobs:
     name: Verify tidy
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -125,10 +125,10 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.x
+      - name: Set up Go 1.21.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
diff --git a/Dockerfile b/Dockerfile
index 7782a3b8..541c670a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/doc/development.md b/doc/development.md
index 738d912c..9a4cf46f 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -23,7 +23,7 @@
 * [operator-sdk] version v1.28.1
 * [kind] version v0.20.0
 * [git][git_tool]
-* [go] version 1.20+
+* [go] version 1.21+
 * [kubernetes] version v1.25+
 * [kubectl] version v1.25+