Adding "vet" target to Makefile.

Added "vet" target to Makefile and fixed vet-reported issue.
openshift · Jan 28, 2020 · d585821 · d585821
1 parent d05a19c
commit d585821
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -86,6 +86,9 @@ else
 	@exit 1
 endif
 
+vet:
+	$(GO) vet ./...
+
 test:
 	$(GO) test ./cmd/... ./pkg/... -coverprofile cover.out
 

diff --git a/pkg/operator/controller.go b/pkg/operator/controller.go
@@ -406,7 +406,6 @@ func (c *Controller) syncProfile(tuned *tunedv1.Tuned, nodeName string) error {
 		if err != nil {
 			return fmt.Errorf("failed to update Profile: %v", err)
 		}
-		return nil
 	}
 
 	return nil

diff --git a/pkg/operator/profilecalculator.go b/pkg/operator/profilecalculator.go
@@ -82,7 +82,7 @@ func (pc *ProfileCalculator) podChangeHandler(podNamespace string, podName strin
 	podLabels := pc.state.podLabels[nodeName]
 
 	if !mapOfStringsEqual(podLabelsNew, podLabels[podNamespaceName]) {
-		// Node labels for nodeName changed
+		// Pod podName labels on nodeName changed
 		klog.V(3).Infof("Pod %q labels on Node %q changed: %v", podName, nodeName, true)
 		changeNodeWide := podLabelsNodeWideChange(podLabels, podNamespaceName, podLabelsNew)
 		podLabels[podNamespaceName] = podLabelsNew

diff --git a/pkg/operator/status.go b/pkg/operator/status.go
@@ -192,7 +192,7 @@ func (c *Controller) computeStatusConditions(conditions []configv1.ClusterOperat
 			klog.V(3).Infof("operator unavailable for longer than %d seconds, setting Degraded status.", maxTunedUnavailable)
 			degradedCondition.Status = configv1.ConditionTrue
 			degradedCondition.Reason = "TunedUnavailable"
-			degradedCondition.Message = fmt.Sprintf("DaemonSet %q unavailable for more than %d seconds.", maxTunedUnavailable)
+			degradedCondition.Message = fmt.Sprintf("DaemonSet %q unavailable for more than %d seconds.", dsName, maxTunedUnavailable)
 		}
 	}
 	conditions = clusteroperator.SetStatusCondition(conditions, &degradedCondition)

diff --git a/pkg/tuned/tuned.go b/pkg/tuned/tuned.go
@@ -661,8 +661,6 @@ func changeWatcher() (err error) {
 			}
 		}
 	}
-
-	return nil
 }
 
 func retryLoop() (err error) {