Merge pull request #896 from bysph/master

fix golint errors
kubernetes-retired · Oct 26, 2019 · 4d4382e · 4d4382e
2 parents fc4f930 + 259029a
commit 4d4382e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/pkg/apis/helpers/helpers.go b/pkg/apis/helpers/helpers.go
@@ -99,9 +99,8 @@ func DeleteConfigmap(job *vkv1.Job, kubeClients *kubernetes.Clientset, cmName st
 			glog.V(3).Infof("Failed to get Configmap for Job <%s/%s>: %v",
 				job.Namespace, job.Name, err)
 			return err
-		} else {
-			return nil
 		}
+		return nil
 	}
 
 	if err := kubeClients.CoreV1().ConfigMaps(job.Namespace).Delete(cmName, nil); err != nil {

diff --git a/test/e2e/metric_util.go b/test/e2e/metric_util.go
@@ -91,7 +91,7 @@ func PrettyPrintJSON(metrics interface{}) string {
 
 //// PodStartupLatencyToPerfData transforms PodStartupLatency to PerfData.
 func PodStartupLatencyToPerfData(latency *PodStartupLatency) *perftype.PerfData {
-	perfData := &perftype.PerfData{Version: currentApiCallMetricsVersion}
+	perfData := &perftype.PerfData{Version: currentAPICallMetricsVersion}
 	perfData.DataItems = append(perfData.DataItems, latencyToPerfData(latency.CreateToScheduleLatency, "create_to_schedule"))
 	perfData.DataItems = append(perfData.DataItems, latencyToPerfData(latency.ScheduleToRunLatency, "schedule_to_run"))
 	perfData.DataItems = append(perfData.DataItems, latencyToPerfData(latency.RunToWatchLatency, "run_to_watch"))

diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -53,7 +53,7 @@ import (
 	. "github.com/onsi/ginkgo"
 )
 
-const currentApiCallMetricsVersion = "v1"
+const currentAPICallMetricsVersion = "v1"
 
 var oneMinute = 1 * time.Minute
 var tenMinute = 10 * time.Minute