Bump to Go 1.22

nrb · nrb · commit 5dc10a1216de · 2024-05-31T14:08:30.000-04:00
Signed-off-by: Nolan Brubaker &lt;nolan@nbrubaker.com&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.21 AS builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.22 AS builder
 WORKDIR /go/src/github.com/openshift/machine-api-operator
 COPY . .
 RUN NO_DOCKER=1 make build
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ DBG         ?= 0
 VERSION     ?= $(shell git describe --always --abbrev=7)
 MUTABLE_TAG ?= latest
 IMAGE        = $(REGISTRY)machine-api-operator
-BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.21
+BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.22
 GOLANGCI_LINT = go run ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
 
 # Enable go modules and vendoring

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.ci.openshift.org/openshift/release:golang-1.21 AS builder`
	`1`	`+FROM registry.ci.openshift.org/openshift/release:golang-1.22 AS builder`
`2`	`2`	`WORKDIR /go/src/github.com/openshift/machine-api-operator`
`3`	`3`	`COPY . .`
`4`	`4`	`RUN NO_DOCKER=1 make build`