Merge pull request #20828 from pwittrock/metricse2etest

test/e2e_node/kubelet_test.go

@@ -184,13 +184,9 @@ var _ = Describe("Kubelet", func() {
 						Expect(vs.CapacityBytes).NotTo(BeZero())
 						Expect(vs.AvailableBytes).NotTo(BeZero())
 						Expect(vs.UsedBytes).NotTo(BeZero())
-						if strings.HasPrefix(vs.Name, "default-token-") {
-							volumeNames = append(volumeNames, "default-token-")
-						} else {
-							volumeNames = append(volumeNames, vs.Name)
-						}
+						volumeNames = append(volumeNames, vs.Name)
 					}
-					Expect(volumeNames).To(ConsistOf("default-token-", "test-empty-dir"))
+					Expect(volumeNames).To(ConsistOf("test-empty-dir"))
 
 					// fs usage (not for system containers)
 					Expect(container.Rootfs).NotTo(BeNil(), spew.Sdump(container))

test/e2e_node/runner/run_e2e.go

@@ -52,7 +52,7 @@ var kubeOutputRelPath = flag.String("k8s-build-output", "_output/local/bin/linux
 var kubeRoot = ""
 
 const buildScriptRelPath = "hack/build-go.sh"
-const ginkoTestRelPath = "test/e2e_node"
+const ginkgoTestRelPath = "test/e2e_node"
 const healthyTimeoutDuration = time.Minute * 3
 
 func main() {
@@ -158,9 +158,9 @@ func runTests(fullhost string) ([]byte, error) {
 	glog.Infof("Kubelet host %s tunnel running on port %s", host, ah.LPort)
 	u.Wait()
 	glog.Infof("Running ginkgo tests against host %s", host)
-	ginkoTests := filepath.Join(kubeRoot, ginkoTestRelPath)
+	ginkgoTests := filepath.Join(kubeRoot, ginkgoTestRelPath)
 	return exec.Command(
-		"ginkgo", ginkoTests, "--",
+		"ginkgo", ginkgoTests, "--",
 		"--kubelet-address", fmt.Sprintf("http://127.0.0.1:%s", kh.LPort),
 		"--api-server-address", fmt.Sprintf("http://127.0.0.1:%s", ah.LPort),
 		"--node-name", fullhost,