Merge pull request #8638 from jayunit100/fix_c_shadow

test/e2e/networking.go

@@ -31,8 +31,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var c *client.Client = nil
-
 func LaunchNetTestPodPerNode(nodes *api.NodeList, name string, c *client.Client, ns string) []string {
 	podNames := []string{}
 

test/e2e/reboot.go

@@ -55,6 +55,9 @@ const (
 )
 
 var _ = Describe("Reboot", func() {
+
+	var c *client.Client = nil
+
 	BeforeEach(func() {
 		var err error
 		c, err = loadClient()

test/e2e/ssh.go

@@ -20,11 +20,16 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("SSH", func() {
+
+	var c *client.Client = nil
+
 	BeforeEach(func() {
 		var err error
 		c, err = loadClient()