bump to golang 1.24

stuggi · stuggi · commit 3fd572e77c71 · 2025-09-18T12:24:54.000+02:00
* bump in go.mod (base and api)
* bump go-toolset in Dockerfile
* bump in github jobs ('.github/workflows')
* Bump the golangci-lint version in the .pre-commit-config.yaml to v2.4.0
* Bump build_root_image in .ci-operator.yaml to ci-build-root-golang-1.24-sdk-1.31

Also fixes golangci-lint reported issues for new v2.4.0 version.

Jira: OSPRH-12935
Signed-off-by: Martin Schuppert &lt;mschuppert@redhat.com&gt;
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: tools
   namespace: openstack-k8s-operators
-  tag: ci-build-root-golang-1.21-sdk-1.31
+  tag: ci-build-root-golang-1.24-sdk-1.31
diff --git a/.github/workflows/build-openstack-baremetal-operator.yaml b/.github/workflows/build-openstack-baremetal-operator.yaml
@@ -26,7 +26,7 @@ jobs:
     needs: [build-openstack-baremetal-operator-agent]
     with:
       operator_name: openstack-baremetal
-      go_version: 1.21.x
+      go_version: 1.24.x
       operator_sdk_version: 1.31.0
     secrets:
       IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }}
diff --git a/.github/workflows/force-bump-pr-manual.yaml b/.github/workflows/force-bump-pr-manual.yaml
@@ -9,5 +9,6 @@ jobs:
     with:
       operator_name: openstack-baremetal
       branch_name: ${{ github.ref_name }}
+      custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.31
     secrets:
       FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}
diff --git a/.github/workflows/force-bump-pr-scheduled.yaml b/.github/workflows/force-bump-pr-scheduled.yaml
@@ -10,5 +10,6 @@ jobs:
     uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/force-bump-branches.yaml@main
     with:
       operator_name: openstack-baremetal
+      custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.31
     secrets:
       FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,14 +1,20 @@
+version: 2
+
 linters:
   # Enable specific linter
   # https://golangci-lint.run/usage/linters/#enabled-by-default
   enable:
     - errorlint
     - revive
     - ginkgolinter
-    - gofmt
     - govet
     - gosec
     - errname
     - err113
+
+formatters:
+  enable:
+    - gofmt
+
 run:
   timeout: 5m
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -36,7 +36,7 @@ repos:
     - id: go-mod-tidy
 
 - repo: https://github.com/golangci/golangci-lint
-  rev: v1.59.1
+  rev: v2.4.0
   hooks:
     - id: golangci-lint-full
       args: ["-v"]
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.21
+ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24
 ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
 
 # Build the manager binary
diff --git a/Dockerfile.agent b/Dockerfile.agent
@@ -1,4 +1,4 @@
-ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.21
+ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24
 ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
 
 # Build the manager binary
diff --git a/Makefile b/Makefile
@@ -86,7 +86,7 @@ SHELL = /usr/bin/env bash -o pipefail
 # Extra vars which will be passed to the Docker-build
 DOCKER_BUILD_ARGS ?=
 
-GOTOOLCHAIN_VERSION ?= go1.21.0
+GOTOOLCHAIN_VERSION ?= go1.24.0
 
 .PHONY: all
 all: build
@@ -347,9 +347,10 @@ govet: get-ci-tools
 # Run go test against code
 gotest: test
 
+GOLANGCI_LINT_VERSION ?= v2.4.0
 .PHONY: golangci-lint
 golangci-lint:
-	test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.59.1
+	test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
 	$(LOCALBIN)/golangci-lint run --fix
 
 .PHONY: vulncheck
diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/openstack-k8s-operators/openstack-baremetal-operator/api
 
-go 1.21
+go 1.24
 
 require (
 	github.com/go-logr/logr v1.4.3
diff --git a/containers/agent/checksum_discovery.go b/containers/agent/checksum_discovery.go
@@ -1,3 +1,4 @@
+// Package main provides a checksum discovery agent for OpenStack baremetal provisioning
 package main
 
 import (
diff --git a/controllers/openstackbaremetalset_controller.go b/controllers/openstackbaremetalset_controller.go
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Package controllers contains the Kubernetes controllers for managing OpenStack baremetal operator resources
 package controllers
 
 import (
@@ -81,7 +82,7 @@ func (r *OpenStackBaremetalSetReconciler) Reconcile(ctx context.Context, req ctr
 
 	// Fetch the OpenStackBaremetalSet instance
 	instance := &baremetalv1.OpenStackBaremetalSet{}
-	err := r.Client.Get(ctx, req.NamespacedName, instance)
+	err := r.Get(ctx, req.NamespacedName, instance)
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
 			// Request object not found, could have been deleted after reconcile request.
@@ -406,7 +407,7 @@ func (r *OpenStackBaremetalSetReconciler) reconcileNormal(ctx context.Context, i
 		// If the above call hit an error, the error will drop through and be handled below
 		if err == nil {
 			// Get the pre-existing OsProvServer that we intend to use
-			err = r.Client.Get(ctx, types.NamespacedName{Name: instance.Spec.ProvisionServerName, Namespace: instance.Namespace}, provisionServer)
+			err = r.Get(ctx, types.NamespacedName{Name: instance.Spec.ProvisionServerName, Namespace: instance.Namespace}, provisionServer)
 		}
 	}
 
@@ -548,8 +549,8 @@ func (r *OpenStackBaremetalSetReconciler) provisionServerCreateOrUpdate(
 	// Next deploy the provisioning image (Apache) server
 	provisionServer := &baremetalv1.OpenStackProvisionServer{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      instance.ObjectMeta.Name + "-provisionserver",
-			Namespace: instance.ObjectMeta.Namespace,
+			Name:      instance.Name + "-provisionserver",
+			Namespace: instance.Namespace,
 		},
 	}
 
@@ -599,11 +600,11 @@ func (r *OpenStackBaremetalSetReconciler) provisionServerDelete(
 	provisionServer := &baremetalv1.OpenStackProvisionServer{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("%s-provisionserver", instance.Name),
-			Namespace: instance.ObjectMeta.Namespace,
+			Namespace: instance.Namespace,
 		},
 	}
 
-	err := r.Client.Delete(ctx, provisionServer)
+	err := r.Delete(ctx, provisionServer)
 
 	if err == nil {
 		l.Info("OpenStackProvisionServer successfully deleted", "OpenStackProvisionServer", provisionServer.Name)
diff --git a/controllers/openstackprovisionserver_controller.go b/controllers/openstackprovisionserver_controller.go
@@ -102,7 +102,7 @@ func (r *OpenStackProvisionServerReconciler) Reconcile(ctx context.Context, req
 
 	// Fetch the OpenStackProvisionServer instance
 	instance := &baremetalv1.OpenStackProvisionServer{}
-	err := r.Client.Get(ctx, req.NamespacedName, instance)
+	err := r.Get(ctx, req.NamespacedName, instance)
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
 			// Request object not found, could have been deleted after reconcile request.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openstack-k8s-operators/openstack-baremetal-operator
 
-go 1.21
+go 1.24
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
diff --git a/main.go b/main.go
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Package main provides the entry point for the OpenStack baremetal operator
 package main
 
 import (
diff --git a/pkg/openstackbaremetalset/baremetalhost.go b/pkg/openstackbaremetalset/baremetalhost.go
@@ -1,3 +1,4 @@
+// Package openstackbaremetalset provides functionality for managing OpenStack baremetal host sets
 package openstackbaremetalset
 
 import (
diff --git a/pkg/openstackprovisionserver/const.go b/pkg/openstackprovisionserver/const.go
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Package openstackprovisionserver provides functionality for managing OpenStack provisioning servers
 package openstackprovisionserver
 
 const (
diff --git a/pkg/openstackprovisionserver/deployment.go b/pkg/openstackprovisionserver/deployment.go
@@ -178,7 +178,7 @@ func Deployment(
 		},
 	}
 
-	if instance.Spec.NodeSelector != nil && len(instance.Spec.NodeSelector) > 0 {
+	if len(instance.Spec.NodeSelector) > 0 {
 		deployment.Spec.Template.Spec.NodeSelector = instance.Spec.NodeSelector
 	}
 
diff --git a/pkg/openstackprovisionserver/errors.go b/pkg/openstackprovisionserver/errors.go
@@ -3,5 +3,6 @@ package openstackprovisionserver
 import "errors"
 
 var (
+	// ErrProvisioningAgent is returned when the provisioning agent reports an error
 	ErrProvisioningAgent = errors.New("provisioning agent reported error")
 )
diff --git a/pkg/openstackprovisionserver/job.go b/pkg/openstackprovisionserver/job.go
@@ -81,7 +81,7 @@ func ChecksumJob(
 		},
 	}
 
-	if instance.Spec.NodeSelector != nil && len(instance.Spec.NodeSelector) > 0 {
+	if len(instance.Spec.NodeSelector) > 0 {
 		job.Spec.Template.Spec.NodeSelector = instance.Spec.NodeSelector
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.21`
	`1`	`+ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24`
`2`	`2`	`ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest`
`3`	`3`
`4`	`4`	`# Build the manager binary`