ACM-29460: Upgrade go to v1.25.7 to mitigate CVE-2025-61726 (#839)

Includes:
- Upgrade setup-envtest to release-0.22 and k8s to 1.30
to match the newer go version
- Updating go.mod files to 1.25.7
- Updating docker files to use Go 1.25's builder image
- Updating ci-operator file to use Go 1.25 as a base

Author: CrystalChun

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.24-openshift-4.21
+  tag: rhel-9-release-golang-1.25-openshift-4.22

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
 
 USER 0
 

Dockerfile.rhtap

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 as builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 as builder
 
 WORKDIR /workspace
 COPY . .

Makefile

@@ -41,7 +41,7 @@ NAMESPACE ?= cluster-api-provider-agent
 WATCH_NAMESPACE ?= ""
 AGENTS_NAMESPACE ?= ""
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.21
+ENVTEST_K8S_VERSION = 1.30
 
 # Runtime CLI to use for building and pushing images
 RUNTIME ?= docker
@@ -155,7 +155,7 @@ kustomize: ## Download kustomize locally if necessary.
 
 ENVTEST = $(shell pwd)/bin/setup-envtest
 envtest: ## Download envtest-setup locally if necessary.
-	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20240315194348-5aaf1190f880)
+	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.22)
 
 MOCKGEN = $(shell pwd)/bin/mockgen
 mockgen: ## Download mockgen locally if necessary.

api/go.mod

@@ -1,8 +1,6 @@
 module github.com/openshift/cluster-api-provider-agent/api
 
-go 1.24.0
-
-toolchain go1.24.2
+go 1.25.7
 
 require (
 	github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094

go.mod

@@ -1,6 +1,6 @@
 module github.com/openshift/cluster-api-provider-agent
 
-go 1.24.6
+go 1.25.7
 
 // Versions to be held for v1beta1
 // sigs.k8s.io/controller-runtime on v0.11.x

vendor/modules.txt

@@ -217,7 +217,7 @@ github.com/openshift/assisted-service/api/v1beta1
 github.com/openshift/assisted-service/models
 github.com/openshift/assisted-service/models/validations
 # github.com/openshift/cluster-api-provider-agent/api v0.0.0-20250324094320-633957e81ebd => ./api
-## explicit; go 1.24.0
+## explicit; go 1.25.7
 github.com/openshift/cluster-api-provider-agent/api/v1alpha1
 github.com/openshift/cluster-api-provider-agent/api/v1beta1
 # github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87