[golang] bump to golang 1.22

.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.22-sdk-1.31

.github/workflows/build-openstack-operator.yaml

@@ -15,7 +15,7 @@ jobs:
     uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/reusable-build-operator.yaml@main
     with:
       operator_name: openstack
-      go_version: 1.21.x
+      go_version: 1.22.x
       operator_sdk_version: 1.31.0
       bundle_dockerfile: ./bundle.Dockerfile
     secrets:

.github/workflows/docs.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - uses: actions/checkout@v4
         with:
           # this fetches all branches. Needed because we need gh-pages branch for deploy to work

.github/workflows/kustom.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - uses: actions/checkout@v4
         with:
           # this fetches all branches. Needed because we need gh-pages branch for deploy to work

.pre-commit-config.yaml

@@ -70,7 +70,7 @@ repos:
       entry: bashate --error . --ignore=E006,E040,E011,E020,E012
 
 - repo: https://github.com/golangci/golangci-lint
-  rev: v1.59.1
+  rev: v1.63.4
   hooks:
     - id: golangci-lint-full
       args: ["-v"]

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.22
 ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
 # Build the manager binary
 FROM $GOLANG_BUILDER AS builder

Makefile

@@ -184,7 +184,7 @@ tidy: ## Run go mod tidy on every mod file in the repo
 
 .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 v1.63.4
 	$(LOCALBIN)/golangci-lint run --fix
 
 MAX_PROCS := 5
@@ -306,8 +306,8 @@ KUSTOMIZE_VERSION ?= v5.5.0 #(dprince: bumped to aquire new features like --load
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
 CRD_MARKDOWN_VERSION ?= v0.0.3
 KUTTL_VERSION ?= 0.17.0
-GOTOOLCHAIN_VERSION ?= go1.21.0
-OC_VERSION ?= 4.14.0
+GOTOOLCHAIN_VERSION ?= go1.22.0
+OC_VERSION ?= 4.16.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

apis/go.mod

@@ -1,6 +1,6 @@
 module github.com/openstack-k8s-operators/openstack-operator/apis
 
-go 1.21
+go 1.22
 
 require (
 	github.com/cert-manager/cert-manager v1.14.7

controllers/client/openstackclient_controller.go

@@ -266,7 +266,8 @@ func (r *OpenStackClientReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 					condition.TLSInputReadyCondition,
 					condition.RequestedReason,
 					condition.SeverityInfo,
-					fmt.Sprintf(condition.TLSInputReadyWaitingMessage, instance.Spec.CaBundleSecretName)))
+					condition.TLSInputReadyWaitingMessage,
+					instance.Spec.CaBundleSecretName))
 				return ctrl.Result{}, nil
 			}
 			instance.Status.Conditions.Set(condition.FalseCondition(

controllers/dataplane/openstackdataplanedeployment_controller.go

@@ -338,7 +338,7 @@ func (r *OpenStackDataPlaneDeploymentReconciler) Reconcile(ctx context.Context,
 			severity,
 			condition.DeploymentReadyErrorMessage,
 			deploymentErrMsg)
-		return ctrl.Result{}, fmt.Errorf(deploymentErrMsg)
+		return ctrl.Result{}, fmt.Errorf("%s", deploymentErrMsg)
 	}
 
 	if shouldRequeue {

controllers/dataplane/openstackdataplanenodeset_controller.go

@@ -19,11 +19,11 @@ package dataplane
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/go-playground/validator/v10"
-	"golang.org/x/exp/slices"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -276,7 +276,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req
 			condition.InputReadyCondition,
 			condition.RequestedReason,
 			condition.SeverityError,
-			err.Error())
+			"%s", err.Error())
 		return result, err
 	} else if (result != ctrl.Result{}) {
 		instance.Status.Conditions.MarkFalse(
@@ -455,7 +455,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req
 		}
 		instance.Status.Conditions.MarkFalse(condition.DeploymentReadyCondition,
 			condition.ErrorReason, condition.SeverityError,
-			deployErrorMsg)
+			"%s", deployErrorMsg)
 	}
 
 	return ctrl.Result{}, err
@@ -505,7 +505,7 @@ func checkDeployment(ctx context.Context, helper *helper.Helper,
 			instance.Status.DeploymentStatuses[deployment.Name] = deploymentConditions
 			deploymentCondition := deploymentConditions.Get(dataplanev1.NodeSetDeploymentReadyCondition)
 			if condition.IsError(deploymentCondition) {
-				err = fmt.Errorf(deploymentCondition.Message)
+				err = fmt.Errorf("%s", deploymentCondition.Message)
 				isDeploymentFailed = true
 				failedDeploymentName = deployment.Name
 				break

go.mod

@@ -1,6 +1,6 @@
 module github.com/openstack-k8s-operators/openstack-operator
 
-go 1.21
+go 1.22
 
 require (
 	github.com/cert-manager/cert-manager v1.14.7
@@ -41,7 +41,6 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rabbitmq/cluster-operator/v2 v2.11.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.29.15
 	k8s.io/apimachinery v0.29.15
@@ -94,6 +93,7 @@ require (
 	github.com/spf13/pflag v1.0.6 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.18.0 // indirect

pkg/dataplane/cert.go

@@ -21,13 +21,12 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
-	"golang.org/x/exp/slices"
-
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachineryvalidation "k8s.io/apimachinery/pkg/util/validation"

pkg/dataplane/deployment.go

@@ -23,13 +23,13 @@ import (
 	"fmt"
 	"path"
 	"reflect"
+	"slices"
 	"sort"
 	"strconv"
 
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 
-	slices "golang.org/x/exp/slices"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	apimachineryvalidation "k8s.io/apimachinery/pkg/util/validation"
@@ -207,7 +207,7 @@ func (d *Deployer) ConditionalDeploy(
 			readyCondition,
 			condition.RequestedReason,
 			condition.SeverityInfo,
-			readyWaitingMessage))
+			"%s", readyWaitingMessage))
 
 	}
 
@@ -234,7 +234,7 @@ func (d *Deployer) ConditionalDeploy(
 			log.Info(fmt.Sprintf("Condition %s ready", readyCondition))
 			nsConditions.Set(condition.TrueCondition(
 				readyCondition,
-				readyMessage))
+				"%s", readyMessage))
 		} else if ansibleJob.Status.Failed > *ansibleJob.Spec.BackoffLimit {
 			errorMsg := fmt.Sprintf("execution.name %s execution.namespace %s failed pods: %d", ansibleJob.Name, ansibleJob.Namespace, ansibleJob.Status.Failed)
 			for _, condition := range ansibleJob.Status.Conditions {
@@ -246,7 +246,7 @@ func (d *Deployer) ConditionalDeploy(
 				errorMsg = fmt.Sprintf("backoff limit reached for execution.name %s execution.namespace %s execution.condition.message: %s", ansibleJob.Name, ansibleJob.Namespace, ansibleCondition.Message)
 			}
 			log.Info(fmt.Sprintf("Condition %s error", readyCondition))
-			err = fmt.Errorf(errorMsg)
+			err = fmt.Errorf("%s", errorMsg)
 			nsConditions.Set(condition.FalseCondition(
 				readyCondition,
 				condition.Reason(ansibleCondition.Reason),
@@ -259,7 +259,7 @@ func (d *Deployer) ConditionalDeploy(
 				readyCondition,
 				condition.RequestedReason,
 				condition.SeverityInfo,
-				readyWaitingMessage))
+				"%s", readyWaitingMessage))
 		}
 	}
 	d.Status.NodeSetConditions[d.NodeSet.Name] = nsConditions

pkg/dataplane/ipam.go

@@ -198,7 +198,7 @@ func EnsureDNSData(ctx context.Context, helper *helper.Helper,
 		instance.Status.Conditions.MarkFalse(
 			dataplanev1.NodeSetDNSDataReadyCondition,
 			condition.ErrorReason, condition.SeverityError,
-			err.Error())
+			"%s", err.Error())
 		return dnsDetails, err
 	}
 	if dnsDetails.ClusterAddresses == nil {
@@ -348,7 +348,7 @@ func reserveIPs(ctx context.Context, helper *helper.Helper,
 	if len(netConfigList.Items) == 0 {
 		errMsg := "no NetConfig CR exists yet"
 		util.LogForObject(helper, errMsg, instance)
-		return nil, nil, fmt.Errorf(errMsg)
+		return nil, nil, fmt.Errorf("%s", errMsg)
 	}
 	netServiceNetMap := BuildNetServiceNetMap(netConfigList.Items[0])
 	allIPSets := make(map[string]infranetworkv1.IPSet)
@@ -371,7 +371,7 @@ func reserveIPs(ctx context.Context, helper *helper.Helper,
 			}
 			if !foundCtlPlane {
 				msg := fmt.Sprintf("ctlplane network should be defined for node %s", nodeName)
-				return nil, netServiceNetMap, fmt.Errorf(msg)
+				return nil, netServiceNetMap, fmt.Errorf("%s", msg)
 			}
 			ipSet := &infranetworkv1.IPSet{
 				ObjectMeta: metav1.ObjectMeta{
@@ -395,7 +395,7 @@ func reserveIPs(ctx context.Context, helper *helper.Helper,
 		} else {
 			msg := fmt.Sprintf("No Networks defined for node %s or template", nodeName)
 			util.LogForObject(helper, msg, instance)
-			return nil, netServiceNetMap, fmt.Errorf(msg)
+			return nil, netServiceNetMap, fmt.Errorf("%s", msg)
 		}
 	}
 	return allIPSets, netServiceNetMap, nil

pkg/dataplane/service.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/slices"
 	yaml "gopkg.in/yaml.v3"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/dataplane/util/ansibleee.go

@@ -111,7 +111,7 @@ func (a *EEJob) JobForOpenStackAnsibleEE(h *helper.Helper) (*batchv1.Job, error)
 		}},
 	}
 
-	if a.NodeSelector != nil && len(a.NodeSelector) > 0 {
+	if len(a.NodeSelector) > 0 {
 		podSpec.NodeSelector = a.NodeSelector
 	}
 

pkg/openstack/ca.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"math"
 	"os"
+	"slices"
 	"time"
 
 	certmgrv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
@@ -19,7 +20,6 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/secret"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
-	"golang.org/x/exp/slices"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 
 	corev1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1"

pkg/openstack/galera.go

@@ -174,7 +174,7 @@ func ReconcileGaleras(
 			corev1beta1.OpenStackControlPlaneMariaDBReadyErrorMessage,
 			errors))
 
-		return ctrl.Result{}, fmt.Errorf(errors)
+		return ctrl.Result{}, fmt.Errorf("%s", errors)
 
 	} else if len(inprogress) > 0 {
 		log.Info("Galera in progress")

pkg/openstack/memcached.go

@@ -119,7 +119,7 @@ func ReconcileMemcacheds(
 			corev1beta1.OpenStackControlPlaneMemcachedReadyErrorMessage,
 			errors))
 
-		return ctrlResult, fmt.Errorf(errors)
+		return ctrlResult, fmt.Errorf("%s", errors)
 
 	} else if len(inprogress) > 0 {
 		instance.Status.Conditions.Set(condition.FalseCondition(

pkg/openstack/rabbitmq.go

@@ -128,7 +128,7 @@ func ReconcileRabbitMQs(
 			corev1beta1.OpenStackControlPlaneRabbitMQReadyErrorMessage,
 			errors))
 
-		return ctrl.Result{}, fmt.Errorf(errors)
+		return ctrl.Result{}, fmt.Errorf("%s", errors)
 
 	} else if len(inprogress) > 0 {
 		instance.Status.Conditions.Set(condition.FalseCondition(
@@ -259,7 +259,7 @@ func reconcileRabbitMQ(
 	op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), rabbitmq, func() error {
 		spec.DeepCopyInto(&rabbitmq.Spec.RabbitMqSpecCore)
 		if rabbitmq.Spec.Persistence.StorageClassName == nil {
-			log.Info(fmt.Sprintf("Setting StorageClassName: " + instance.Spec.StorageClass))
+			log.Info(fmt.Sprintf("Setting StorageClassName: %s", instance.Spec.StorageClass))
 			rabbitmq.Spec.Persistence.StorageClassName = &instance.Spec.StorageClass
 		}
 		if tlsCert != "" {

pkg/openstack/redis.go

@@ -134,7 +134,7 @@ func ReconcileRedis(
 			corev1beta1.OpenStackControlPlaneRedisReadyErrorMessage,
 			errors))
 
-		return ctrlResult, fmt.Errorf(errors)
+		return ctrlResult, fmt.Errorf("%s", errors)
 
 	} else if len(inprogress) > 0 {
 		instance.Status.Conditions.Set(condition.FalseCondition(

tests/functional/dataplane/openstackdataplanenodeset_controller_test.go

@@ -1327,8 +1327,8 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 				const bootstrapName string = "bootstrap"
 				// Make an AnsibleEE name for each service
 				ansibleeeName := types.NamespacedName{
-					Name: fmt.Sprintf(
-						bootstrapName + "-" + dataplaneDeploymentName.Name + "-" + dataplaneNodeSetName.Name),
+					Name: fmt.Sprintf("%s-%s-%s",
+						bootstrapName, dataplaneDeploymentName.Name, dataplaneNodeSetName.Name),
 					Namespace: namespace,
 				}
 				ansibleEE := GetAnsibleee(ansibleeeName)
@@ -1394,8 +1394,8 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 				const bootstrapName string = "bootstrap"
 				// Make an AnsibleEE name for each service
 				ansibleeeName := types.NamespacedName{
-					Name: fmt.Sprintf(
-						bootstrapName + "-" + dataplaneDeploymentName.Name + "-" + dataplaneNodeSetName.Name),
+					Name: fmt.Sprintf("%s-%s-%s",
+						bootstrapName, dataplaneDeploymentName.Name, dataplaneNodeSetName.Name),
 					Namespace: namespace,
 				}
 				ansibleEE := GetAnsibleee(ansibleeeName)

zuul.d/jobs.yaml

@@ -32,8 +32,8 @@
     parent: podified-multinode-edpm-deployment-crc-3comp
     dependencies: ["openstack-k8s-operators-content-provider"]
     vars:
-      cifmw_operator_build_golang_ct: "docker.io/library/golang:1.21"
-      cifmw_operator_build_golang_alt_ct: "quay.rdoproject.org/openstack-k8s-operators/golang:1.21"
+      cifmw_operator_build_golang_ct: "docker.io/library/golang:1.22"
+      cifmw_operator_build_golang_alt_ct: "quay.rdoproject.org/openstack-k8s-operators/golang:1.22"
       cifmw_tempest_tempestconf_config:
           # NOTE(alee) these tests will fail with barbican in the mix
           # while cinder/nova is not configured to talk to barbican