From 273b5f5b17bc90cbc02e7c898d79901ce1eee688 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Tue, 17 Sep 2024 17:15:49 +1000 Subject: [PATCH] Fix objects for Go 1.21 This changes fixes the ResourceRequirements which is now VolumeResourceRequirements, along with satisfying pre-commit by allocating blank identifiers for unused function args Signed-off-by: Brendan Shephard --- controllers/swiftproxy_controller.go | 2 +- controllers/swiftring_controller.go | 2 +- controllers/swiftstorage_controller.go | 2 +- pkg/swiftstorage/statefulset.go | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/controllers/swiftproxy_controller.go b/controllers/swiftproxy_controller.go index 5568ec7..e4b81eb 100644 --- a/controllers/swiftproxy_controller.go +++ b/controllers/swiftproxy_controller.go @@ -743,7 +743,7 @@ func (r *SwiftProxyReconciler) SetupWithManager(mgr ctrl.Manager) error { return err } - memcachedFn := func(ctx context.Context, o client.Object) []reconcile.Request { + memcachedFn := func(_ context.Context, o client.Object) []reconcile.Request { result := []reconcile.Request{} // get all SwiftProxy CRs diff --git a/controllers/swiftring_controller.go b/controllers/swiftring_controller.go index 120f3d6..a0e2350 100644 --- a/controllers/swiftring_controller.go +++ b/controllers/swiftring_controller.go @@ -275,7 +275,7 @@ func (r *SwiftRingReconciler) reconcileDelete(ctx context.Context, instance *swi // SetupWithManager sets up the controller with the Manager. func (r *SwiftRingReconciler) SetupWithManager(mgr ctrl.Manager) error { - swiftRingFilter := func(ctx context.Context, o client.Object) []reconcile.Request { + swiftRingFilter := func(_ context.Context, o client.Object) []reconcile.Request { result := []reconcile.Request{} swiftRings := &swiftv1beta1.SwiftRingList{} listOpts := []client.ListOption{client.InNamespace(o.GetNamespace())} diff --git a/controllers/swiftstorage_controller.go b/controllers/swiftstorage_controller.go index bb4c238..35128f3 100644 --- a/controllers/swiftstorage_controller.go +++ b/controllers/swiftstorage_controller.go @@ -401,7 +401,7 @@ func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request func (r *SwiftStorageReconciler) SetupWithManager(mgr ctrl.Manager) error { logger := mgr.GetLogger() - memcachedFn := func(ctx context.Context, o client.Object) []reconcile.Request { + memcachedFn := func(_ context.Context, o client.Object) []reconcile.Request { result := []reconcile.Request{} // get all SwiftStorage CRs diff --git a/pkg/swiftstorage/statefulset.go b/pkg/swiftstorage/statefulset.go index b4d8fb3..49230f8 100644 --- a/pkg/swiftstorage/statefulset.go +++ b/pkg/swiftstorage/statefulset.go @@ -197,8 +197,8 @@ func getStorageContainers(swiftstorage *swiftv1beta1.SwiftStorage, env []corev1. } func StatefulSet( - swiftstorage *swiftv1beta1.SwiftStorage, labels map[string]string, annotations map[string]string, configHash string) (*appsv1.StatefulSet, error) { - + swiftstorage *swiftv1beta1.SwiftStorage, labels map[string]string, annotations map[string]string, configHash string, +) (*appsv1.StatefulSet, error) { trueVal := true OnRootMismatch := corev1.FSGroupChangeOnRootMismatch user := int64(swift.RunAsUser) @@ -259,7 +259,7 @@ func StatefulSet( AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteOnce, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: pvcSize, },