Merge remote-tracking branch 'upstream/main'

Dockerfile

@@ -1,26 +1,6 @@
 # Build the manager binary
 
-# BEGIN -- workaround lack of go-toolset for golang 1.22
-
-ARG GOLANG_IMAGE=docker.io/library/golang:1.22
-
-ARG GOARCH=amd64
-
-FROM ${GOLANG_IMAGE} AS golang
-FROM registry.access.redhat.com/ubi8/ubi:8.8 AS builder
-
-# Install system dependencies
-RUN dnf upgrade -y && dnf install -y \
-    gcc \
-    make \
-    openssl-devel \
-    && dnf clean all && rm -rf /var/cache/yum
-
-# Install Go
-ENV PATH=/usr/local/go/bin:$PATH
-COPY --from=golang /usr/local/go /usr/local/go
-
-# END -- workaround lack of go-toolset for golang 1.22
+FROM registry.access.redhat.com/ubi8/go-toolset:1.22@sha256:780ab5f3874a6e2b1e04bb3719e614e835af3f8ab150922d6e84c2f9fd2bdb27 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests