From 710c8563b4500c7a6175fa9a800fa660f561c148 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Mon, 2 Apr 2018 17:57:44 -0700 Subject: [PATCH] Fix go vet errors --- test/e2e/scheduling/nvidia-gpus.go | 2 +- test/e2e_node/runner/remote/run_remote.go | 16 ++++++++-------- test/integration/master/synthetic_master_test.go | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/e2e/scheduling/nvidia-gpus.go b/test/e2e/scheduling/nvidia-gpus.go index 93dc4e1eee0..44a4f30f8b3 100644 --- a/test/e2e/scheduling/nvidia-gpus.go +++ b/test/e2e/scheduling/nvidia-gpus.go @@ -199,7 +199,7 @@ func SetupNVIDIAGPUNode(f *framework.Framework, setupResourceGatherer bool) *fra var rsgather *framework.ContainerResourceGatherer if setupResourceGatherer { framework.Logf("Starting ResourceUsageGather for the created DaemonSet pods.") - rsgather, err = framework.NewResourceUsageGatherer(f.ClientSet, framework.ResourceGathererOptions{false, false, 2 * time.Second, 2 * time.Second, true}, pods) + rsgather, err = framework.NewResourceUsageGatherer(f.ClientSet, framework.ResourceGathererOptions{InKubemark: false, MasterOnly: false, ResourceDataGatheringPeriod: 2 * time.Second, ProbeDuration: 2 * time.Second, PrintVerboseLogs: true}, pods) framework.ExpectNoError(err, "creating ResourceUsageGather for the daemonset pods") go rsgather.StartGatheringData() } diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index 054d1cbed57..7c440ad96b6 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -134,7 +134,7 @@ type ImageConfig struct { type Accelerator struct { Type string `json:"type,omitempty"` - Count int64 `json:"count, omitempty"` + Count int64 `json:"count,omitempty"` } type Resources struct { @@ -142,19 +142,19 @@ type Resources struct { } type GCEImage struct { - Image string `json:"image, omitempty"` - ImageDesc string `json:"image_description, omitempty"` + Image string `json:"image,omitempty"` + ImageDesc string `json:"image_description,omitempty"` Project string `json:"project"` Metadata string `json:"metadata"` - ImageRegex string `json:"image_regex, omitempty"` + ImageRegex string `json:"image_regex,omitempty"` // Defaults to using only the latest image. Acceptable values are [0, # of images that match the regex). // If the number of existing previous images is lesser than what is desired, the test will use that is available. - PreviousImages int `json:"previous_images, omitempty"` + PreviousImages int `json:"previous_images,omitempty"` - Machine string `json:"machine, omitempty"` - Resources Resources `json:"resources, omitempty"` + Machine string `json:"machine,omitempty"` + Resources Resources `json:"resources,omitempty"` // This test is for benchmark (no limit verification, more result log, node name has format 'machine-image-uuid') if 'Tests' is non-empty. - Tests []string `json:"tests, omitempty"` + Tests []string `json:"tests,omitempty"` } type internalImageConfig struct { diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/master/synthetic_master_test.go index 90d5350d6f3..ff44c2c1f10 100644 --- a/test/integration/master/synthetic_master_test.go +++ b/test/integration/master/synthetic_master_test.go @@ -666,7 +666,7 @@ func TestUpdateNodeObjects(t *testing.T) { go func(lister int) { w, err := c.Nodes().Watch(metav1.ListOptions{}) if err != nil { - fmt.Printf("[watch:%d] error: %v", k, err) + fmt.Printf("[watch:%d] error: %v", lister, err) return } i := 0