From 6299d82ed55c629527f09ed54b17182612b57748 Mon Sep 17 00:00:00 2001
From: Brendan Shephard <bshephar@redhat.com>
Date: Fri, 15 Dec 2023 14:41:26 +1000
Subject: [PATCH] Update to go 1.21

This change updates the version of Go being used from 1.19 > 1.21

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
---
 Dockerfile    | 16 ++++++++--------
 renovate.json | 45 ++++++++++++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 89ebd1e7..b9736763 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_BUILDER=golang:1.19
+ARG GOLANG_BUILDER=golang:1.21
 ARG OPERATOR_BASE_IMAGE=gcr.io/distroless/static:nonroot
 
 # Build the manager binary
@@ -49,16 +49,16 @@ ARG IMAGE_TAGS="cn-openstack openstack"
 
 # Labels required by upstream and osbs build system
 LABEL com.redhat.component="${IMAGE_COMPONENT}" \
-      name="${IMAGE_NAME}" \
-      version="${IMAGE_VERSION}" \
-      summary="${IMAGE_SUMMARY}" \
-      io.k8s.name="${IMAGE_NAME}" \
-      io.k8s.description="${IMAGE_DESC}" \
-      io.openshift.tags="${IMAGE_TAGS}"
+	name="${IMAGE_NAME}" \
+	version="${IMAGE_VERSION}" \
+	summary="${IMAGE_SUMMARY}" \
+	io.k8s.name="${IMAGE_NAME}" \
+	io.k8s.description="${IMAGE_DESC}" \
+	io.openshift.tags="${IMAGE_TAGS}"
 ### DO NOT EDIT LINES ABOVE
 
 ENV USER_UID=$USER_ID \
-    OPERATOR_TEMPLATES=/usr/share/infra-operator/templates/
+	OPERATOR_TEMPLATES=/usr/share/infra-operator/templates/
 
 WORKDIR /
 
diff --git a/renovate.json b/renovate.json
index 67efd5fb..acdbc6d6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,19 +1,30 @@
 {
-  "extends": [
-    "github>openstack-k8s-operators/renovate-config"
-  ],
-  "constraints": {
-    "go": "1.19"
-  },
-  "packageRules": [
-    {
-      "matchPackageNames": ["github.com/openstack-k8s-operators/infra-operator/apis"],
-      "enabled": false
-    }
-  ],
-  "postUpgradeTasks": {
-    "commands": ["make gowork", "make tidy", "make manifests generate"],
-    "fileFilters": ["**/go.mod", "**/go.sum", "**/*.go", "**/*.yaml"],
-    "executionMode": "update"
-  }
+	"extends": [
+		"github>openstack-k8s-operators/renovate-config"
+	],
+	"constraints": {
+		"go": "1.21"
+	},
+	"packageRules": [
+		{
+			"matchPackageNames": [
+				"github.com/openstack-k8s-operators/infra-operator/apis"
+			],
+			"enabled": false
+		}
+	],
+	"postUpgradeTasks": {
+		"commands": [
+			"make gowork",
+			"make tidy",
+			"make manifests generate"
+		],
+		"fileFilters": [
+			"**/go.mod",
+			"**/go.sum",
+			"**/*.go",
+			"**/*.yaml"
+		],
+		"executionMode": "update"
+	}
 }