Skip to content

Bump golang, fix lints. #2064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MirahImage wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Draft

Bump golang, fix lints. #2064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_TAG=1.25
ARG GO_TAG=1.26
ARG DOCKER_REGISTRY=docker.io
# Build the manager binary
FROM --platform=$BUILDPLATFORM ${DOCKER_REGISTRY}/library/golang:${GO_TAG} AS builder
Expand Down
2 changes: 1 addition & 1 deletion bin/kubectl-rabbitmq-plugin/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion controllers/rabbitmqcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion controllers/reconcile_scale_zero.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/promtool/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module promtool

go 1.25.7
go 1.26

tool github.com/prometheus/prometheus/cmd/promtool

Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tools

go 1.25.7
go 1.26

require (
github.com/Masterminds/goutils v1.1.1 // indirect
Expand Down
Loading