Merge pull request kubernetes#92415 from wawa0210/statefulset-staticcheck

fix pkg/controller/statefulset staticcheck

Author: k8s-ci-robot

hack/.staticcheck_failures

@@ -5,7 +5,6 @@ pkg/controller/nodeipam
 pkg/controller/podautoscaler
 pkg/controller/replicaset
 pkg/controller/resourcequota
-pkg/controller/statefulset
 pkg/volume/azure_dd
 pkg/volume/gcepd
 pkg/volume/rbd

pkg/controller/statefulset/stateful_set.go

@@ -374,7 +374,7 @@ func (ssc *StatefulSetController) resolveControllerRef(namespace string, control
 func (ssc *StatefulSetController) enqueueStatefulSet(obj interface{}) {
 	key, err := controller.KeyFunc(obj)
 	if err != nil {
-		utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err))
+		utilruntime.HandleError(fmt.Errorf("couldn't get key for object %+v: %v", obj, err))
 		return
 	}
 	ssc.queue.Add(key)
@@ -389,7 +389,7 @@ func (ssc *StatefulSetController) processNextWorkItem() bool {
 	}
 	defer ssc.queue.Done(key)
 	if err := ssc.sync(key.(string)); err != nil {
-		utilruntime.HandleError(fmt.Errorf("Error syncing StatefulSet %v, requeuing: %v", key.(string), err))
+		utilruntime.HandleError(fmt.Errorf("error syncing StatefulSet %v, requeuing: %v", key.(string), err))
 		ssc.queue.AddRateLimited(key)
 	} else {
 		ssc.queue.Forget(key)

pkg/controller/statefulset/stateful_set_control_test.go

@@ -238,7 +238,7 @@ func ReplacesPods(t *testing.T, set *apps.StatefulSet, invariants invariantFunc)
 		if err != nil {
 			t.Fatalf("Error getting updated StatefulSet: %v", err)
 		}
-		if pods, err = spc.setPodReady(set, i); err != nil {
+		if _, err = spc.setPodReady(set, i); err != nil {
 			t.Error(err)
 		}
 	}

pkg/controller/statefulset/stateful_set_test.go

@@ -98,11 +98,11 @@ func TestStatefulSetControllerRespectsTermination(t *testing.T) {
 	if set.Status.Replicas != 3 {
 		t.Errorf("set.Status.Replicas = %v; want 3", set.Status.Replicas)
 	}
-	pods, err := spc.addTerminatingPod(set, 3)
+	_, err := spc.addTerminatingPod(set, 3)
 	if err != nil {
 		t.Error(err)
 	}
-	pods, err = spc.addTerminatingPod(set, 4)
+	pods, err := spc.addTerminatingPod(set, 4)
 	if err != nil {
 		t.Error(err)
 	}
@@ -152,7 +152,7 @@ func TestStatefulSetControllerBlocksScaling(t *testing.T) {
 	*set.Spec.Replicas = 5
 	fakeResourceVersion(set)
 	spc.setsIndexer.Update(set)
-	pods, err := spc.setPodTerminated(set, 0)
+	_, err := spc.setPodTerminated(set, 0)
 	if err != nil {
 		t.Error("Failed to set pod terminated at ordinal 0")
 	}
@@ -162,7 +162,7 @@ func TestStatefulSetControllerBlocksScaling(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	pods, err = spc.podsLister.Pods(set.Namespace).List(selector)
+	pods, err := spc.podsLister.Pods(set.Namespace).List(selector)
 	if err != nil {
 		t.Error(err)
 	}
@@ -227,7 +227,7 @@ func TestStatefulSetControllerDeletionTimestampRace(t *testing.T) {
 		t.Fatal(err)
 	}
 	revision.OwnerReferences = nil
-	revision, err = ssh.CreateControllerRevision(set, revision, set.Status.CollisionCount)
+	_, err = ssh.CreateControllerRevision(set, revision, set.Status.CollisionCount)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -700,11 +700,10 @@ func scaleUpStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetControl
 			return err
 		}
 		ord := len(pods) - 1
-		pod := getPodAtOrdinal(pods, ord)
 		if pods, err = spc.setPodPending(set, ord); err != nil {
 			return err
 		}
-		pod = getPodAtOrdinal(pods, ord)
+		pod := getPodAtOrdinal(pods, ord)
 		ssc.addPod(pod)
 		fakeWorker(ssc)
 		pod = getPodAtOrdinal(pods, ord)