Bump golang, fix lints.

MirahImage · MirahImage · commit d8716af04e45 · 2026-03-03T15:44:16.000+01:00
diff --git a/bin/kubectl-rabbitmq-plugin/go.mod b/bin/kubectl-rabbitmq-plugin/go.mod
@@ -1,6 +1,6 @@
 module github.com/rabbitmq/cluster-operator/kubectl-rabbitmq-plugin
 
-go 1.25.7
+go 1.26.0
 
 require (
 	github.com/rabbitmq/cluster-operator/v2 v2.0.0-00010101000000-000000000000
diff --git a/controllers/rabbitmqcluster_controller.go b/controllers/rabbitmqcluster_controller.go
@@ -350,9 +350,9 @@ func (r *RabbitmqClusterReconciler) updateStatusConditions(ctx context.Context,
 }
 
 func (r *RabbitmqClusterReconciler) getChildResources(ctx context.Context, rmq *rabbitmqv1beta1.RabbitmqCluster) ([]runtime.Object, error) {
+	var endpointSlice *discoveryv1.EndpointSlice
 	sts := &appsv1.StatefulSet{}
 	endpointSliceList := &discoveryv1.EndpointSliceList{}
-	endpointSlice := &discoveryv1.EndpointSlice{}
 
 	if err := r.Get(ctx,
 		types.NamespacedName{Name: rmq.ChildResourceName("server"), Namespace: rmq.Namespace},
diff --git a/controllers/reconcile_scale_zero.go b/controllers/reconcile_scale_zero.go
@@ -81,7 +81,7 @@ func (r *RabbitmqClusterReconciler) saveReplicasBeforeZero(ctx context.Context,
 // If the annotation rabbitmq.com/before-zero-replicas-configured exists it will be deleted.
 func (r *RabbitmqClusterReconciler) removeReplicasBeforeZeroAnnotationIfExists(ctx context.Context, cluster *v1beta1.RabbitmqCluster) {
 	if _, ok := cluster.Annotations[beforeZeroReplicasConfigured]; ok {
-		r.deleteAnnotation(ctx, cluster, beforeZeroReplicasConfigured)
+		_ = r.deleteAnnotation(ctx, cluster, beforeZeroReplicasConfigured)
 	}
 }
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/rabbitmq/cluster-operator/v2
 
-go 1.25.7
+go 1.26.0
 
 require (
 	github.com/cloudflare/cfssl v1.6.5
diff --git a/internal/promtool/go.mod b/internal/promtool/go.mod
@@ -1,6 +1,6 @@
 module promtool
 
-go 1.25.7
+go 1.26
 
 tool github.com/prometheus/prometheus/cmd/promtool
 
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -1,6 +1,6 @@
 module tools
 
-go 1.25.7
+go 1.26
 
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect

Original file line number	Diff line number	Diff line change
`@@ -350,9 +350,9 @@ func (r *RabbitmqClusterReconciler) updateStatusConditions(ctx context.Context,`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`func (r RabbitmqClusterReconciler) getChildResources(ctx context.Context, rmq rabbitmqv1beta1.RabbitmqCluster) ([]runtime.Object, error) {`
	`353`	`+ var endpointSlice *discoveryv1.EndpointSlice`
`353`	`354`	`sts := &appsv1.StatefulSet{}`
`354`	`355`	`endpointSliceList := &discoveryv1.EndpointSliceList{}`
`355`		`- endpointSlice := &discoveryv1.EndpointSlice{}`
`356`	`356`
`357`	`357`	`if err := r.Get(ctx,`
`358`	`358`	`types.NamespacedName{Name: rmq.ChildResourceName("server"), Namespace: rmq.Namespace},`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (r *RabbitmqClusterReconciler) saveReplicasBeforeZero(ctx context.Context,`
`81`	`81`	`// If the annotation rabbitmq.com/before-zero-replicas-configured exists it will be deleted.`
`82`	`82`	`func (r RabbitmqClusterReconciler) removeReplicasBeforeZeroAnnotationIfExists(ctx context.Context, cluster v1beta1.RabbitmqCluster) {`
`83`	`83`	`if _, ok := cluster.Annotations[beforeZeroReplicasConfigured]; ok {`
`84`		`- r.deleteAnnotation(ctx, cluster, beforeZeroReplicasConfigured)`
	`84`	`+ _ = r.deleteAnnotation(ctx, cluster, beforeZeroReplicasConfigured)`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`