controller: fix some linting warning

timoha · Apr 9, 2024 · 07b3a03 · 07b3a03
1 parent 497ea09
commit 07b3a03
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/internal/controller/hbase_controller_extra.go b/internal/controller/hbase_controller_extra.go
@@ -49,7 +49,7 @@ func DeepHashObject(hasher hash.Hash, objectToWrite interface{}) {
 		DisableMethods: true,
 		SpewKeys:       true,
 	}
-	printer.Fprintf(hasher, "%#v", objectToWrite)
+	_, _ = printer.Fprintf(hasher, "%#v", objectToWrite)
 }
 
 const (
@@ -125,7 +125,7 @@ func (r *HBaseReconciler) deleteUnusedConfigMaps(ctx context.Context, hb *hbasev
 	return nil
 }
 
-func (r *HBaseReconciler) getRegionsPerRegionServer(ctx context.Context) (map[string][][]byte, error) {
+func (r *HBaseReconciler) getRegionsPerRegionServer(_ context.Context) (map[string][][]byte, error) {
 	// get regions via cluster status because this way we can get
 	// regionservers that don't have any regions
 	cs, err := r.GhAdmin.ClusterStatus()
@@ -205,7 +205,10 @@ func (r *HBaseReconciler) moveRegions(ctx context.Context, regions [][]byte, tar
 		} else {
 			// moving regions without a particular target - this is not an error case and guaranteed
 			// to hit when draining the first regionserver in the cluster
-			r.Log.Info("regionservers are balanced and there isn't a regionserver with least regions; moving regions without particular regionserver target", "region", string(region))
+			r.Log.Info(
+				"regionservers are balanced; moving regions without particular regionserver target",
+				"region", string(region),
+			)
 			mr, err = hrpc.NewMoveRegion(ctx, region)
 		}
 		if err != nil {
@@ -620,6 +623,6 @@ func (r *HBaseReconciler) headlessService(hb *hbasev1.HBase) *corev1.Service {
 			},
 		},
 	}
-	controllerutil.SetControllerReference(hb, srv, r.Scheme)
+	_ = controllerutil.SetControllerReference(hb, srv, r.Scheme)
 	return srv
 }
diff --git a/internal/controller/hbase_controller_extra_test.go b/internal/controller/hbase_controller_extra_test.go
@@ -62,8 +62,16 @@ func TestOrderPodList(t *testing.T) {
 		},
 		// Multiple pods
 		{
-			given:  createPodListByName([]string{"regionserver-0", "regionserver-1", "regionserver-2", "regionserver-3", "regionserver-9", "regionserver-10", "regionserver-11", "regionserver-12"}),
-			expect: createPodListByName([]string{"regionserver-12", "regionserver-11", "regionserver-10", "regionserver-9", "regionserver-3", "regionserver-2", "regionserver-1", "regionserver-0"}),
+			given: createPodListByName([]string{
+				"regionserver-0", "regionserver-1", "regionserver-2",
+				"regionserver-3", "regionserver-9", "regionserver-10",
+				"regionserver-11", "regionserver-12",
+			}),
+			expect: createPodListByName([]string{
+				"regionserver-12", "regionserver-11", "regionserver-10",
+				"regionserver-9", "regionserver-3", "regionserver-2",
+				"regionserver-1", "regionserver-0",
+			}),
 		},
 	}
 
@@ -75,7 +83,7 @@ func TestOrderPodList(t *testing.T) {
 		if len(pl1.Items) != len(pl2.Items) {
 			return false
 		}
-		for i, _ := range pl1.Items {
+		for i := range pl1.Items {
 			if pl1.Items[i].Name != pl2.Items[i].Name {
 				return false
 			}

diff --git a/internal/controller/hbase_controller_test.go b/internal/controller/hbase_controller_test.go
@@ -26,7 +26,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	hbasev1 "github.com/timoha/hbase-k8s-operator/api/v1"
@@ -49,10 +49,10 @@ func makeHBaseSpec(confData map[string]string) *hbasev1.HBase {
 				},
 				PodSpec: corev1.PodSpec{
 					Containers: []corev1.Container{
-						corev1.Container{
+						{
 							Name: "server",
 							VolumeMounts: []corev1.VolumeMount{
-								corev1.VolumeMount{
+								{
 									Name:      "config",
 									MountPath: "/hbase/conf/hbase-site.xml",
 									SubPath:   "hbase-site.xml",
@@ -71,10 +71,10 @@ func makeHBaseSpec(confData map[string]string) *hbasev1.HBase {
 				},
 				PodSpec: corev1.PodSpec{
 					Containers: []corev1.Container{
-						corev1.Container{
+						{
 							Name: "server",
 							VolumeMounts: []corev1.VolumeMount{
-								corev1.VolumeMount{
+								{
 									Name:      "config",
 									MountPath: "/hbase/conf/hbase-site.xml",
 									SubPath:   "hbase-site.xml",
@@ -159,7 +159,7 @@ var _ = Describe("HBase controller", func() {
 				Name: "config",
 				VolumeSource: corev1.VolumeSource{
 					ConfigMap: &corev1.ConfigMapVolumeSource{
-						DefaultMode: pointer.Int32Ptr(420),
+						DefaultMode: ptr.To(int32(420)),
 						LocalObjectReference: corev1.LocalObjectReference{
 							Name: createdConfigMap.Name,
 						},
@@ -186,7 +186,7 @@ var _ = Describe("HBase controller", func() {
 				Name: "config",
 				VolumeSource: corev1.VolumeSource{
 					ConfigMap: &corev1.ConfigMapVolumeSource{
-						DefaultMode: pointer.Int32Ptr(420),
+						DefaultMode: ptr.To(int32(420)),
 						LocalObjectReference: corev1.LocalObjectReference{
 							Name: createdConfigMap.Name,
 						},