chore: Enable nilerr, nilnesserr (#4346)

* chore: Enable nilerr, nilnesserr

* Revert to return nil

Author: alexandear

.golangci.yaml

@@ -72,6 +72,8 @@ linters:
     - govet
     - loggercheck
     - misspell
+    - nilerr
+    - nilnesserr
     - nolintlint
     - perfsprint
     - revive

pkg/controller/admissionchecks/multikueue/multikueuecluster.go

@@ -400,7 +400,7 @@ func (c *clustersReconciler) Reconcile(ctx context.Context, req reconcile.Reques
 
 	if err != nil || !cluster.DeletionTimestamp.IsZero() {
 		c.stopAndRemoveCluster(req.Name)
-		return reconcile.Result{}, nil
+		return reconcile.Result{}, nil //nolint:nilerr // nil is intentional, as either the cluster is deleted, or not found
 	}
 
 	// get the kubeconfig

pkg/controller/jobs/jobset/jobset_controller.go

@@ -144,7 +144,7 @@ func (j *JobSet) RunWithPodSetsInfo(podSetsInfo []podset.PodSetInfo) error {
 		template := &j.Spec.ReplicatedJobs[index].Template.Spec.Template
 		info := podSetsInfo[index]
 		if err := podset.Merge(&template.ObjectMeta, &template.Spec, info); err != nil {
-			return nil
+			return err
 		}
 	}
 	return nil