From 10f47dffcc3dbaeec6615a2db3b5e40e8d940230 Mon Sep 17 00:00:00 2001
From: Gerard Ryan <git@grdryn.xyz>
Date: Wed, 11 Dec 2024 08:20:22 +0000
Subject: [PATCH] Update Dockerfiles to Go 1.22 (#1424)

JIRA: https://issues.redhat.com/browse/RHOAIENG-16819

The UBI8 go-toolset image that we use for building is already on 1.22,
so I don't think there's any reason to remain bound to 1.21.

Also, upstream Go only support the two most recent minor versions:
currently that means 1.23 and 1.22; 1.21 is no longer receiving any
updates from the Go developers.
---
 Dockerfiles/Dockerfile         | 2 +-
 Dockerfiles/toolbox.Dockerfile | 2 +-
 Makefile                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfiles/Dockerfile b/Dockerfiles/Dockerfile
index cd48396c06c..a4bf0cc4018 100644
--- a/Dockerfiles/Dockerfile
+++ b/Dockerfiles/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-ARG GOLANG_VERSION=1.21
+ARG GOLANG_VERSION=1.22
 
 ################################################################################
 FROM registry.access.redhat.com/ubi8/toolbox as manifests
diff --git a/Dockerfiles/toolbox.Dockerfile b/Dockerfiles/toolbox.Dockerfile
index 47d86713fdf..19756801248 100644
--- a/Dockerfiles/toolbox.Dockerfile
+++ b/Dockerfiles/toolbox.Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.fedoraproject.org/fedora-toolbox:38
 
-ARG GOLANG_VERSION=1.21
+ARG GOLANG_VERSION=1.22.10
 ARG OPERATOR_SDK_VERSION=1.31.0
 
 ENV GOLANG_VERSION=$GOLANG_VERSION \
diff --git a/Makefile b/Makefile
index 2cd0f7a14fb..ecfae782af3 100644
--- a/Makefile
+++ b/Makefile
@@ -357,7 +357,7 @@ catalog-build: opm ## Build a catalog image.
 catalog-push: ## Push a catalog image.
 	$(MAKE) image-push IMG=$(CATALOG_IMG)
 
-TOOLBOX_GOLANG_VERSION := 1.21
+TOOLBOX_GOLANG_VERSION := 1.22.10
 
 # Generate a Toolbox container for locally testing changes easily
 .PHONY: toolbox