Pass the GCE project, zone, and master name into e2e.go as flags.

cmd/e2e/e2e.go

@@ -29,11 +29,14 @@ import (
 var (
 	authConfig = flag.String("auth_config", os.Getenv("HOME")+"/.kubernetes_auth", "Path to the auth info file.")
 	certDir    = flag.String("cert_dir", "", "Path to the directory containing the certs. Default is empty, which doesn't use certs.")
-	reportDir  = flag.String("report_dir", "", "Path to the directory where the JUnit XML reports should be saved. Default is empty, which doesn't generate these reports.")
+	gceProject = flag.String("gce_project", "", "The GCE project being used, if applicable")
+	gceZone    = flag.String("gce_zone", "", "GCE zone being used, if applicable")
 	host       = flag.String("host", "", "The host to connect to")
-	repoRoot   = flag.String("repo_root", "./", "Root directory of kubernetes repository, for finding test files. Default assumes working directory is repository root")
+	masterName = flag.String("kube_master", "", "Name of the kubernetes master. Only required if provider is gce or gke")
 	provider   = flag.String("provider", "", "The name of the Kubernetes provider")
 	orderseed  = flag.Int64("orderseed", 0, "If non-zero, seed of random test shuffle order. (Otherwise random.)")
+	repoRoot   = flag.String("repo_root", "./", "Root directory of kubernetes repository, for finding test files. Default assumes working directory is repository root")
+	reportDir  = flag.String("report_dir", "", "Path to the directory where the JUnit XML reports should be saved. Default is empty, which doesn't generate these reports.")
 	times      = flag.Int("times", 1, "Number of times each test is eligible to be run. Individual order is determined by shuffling --times instances of each test using --orderseed (like a multi-deck shoe of cards).")
 	testList   util.StringList
 )
@@ -53,5 +56,10 @@ func main() {
 		glog.Error("Invalid --times (negative or no testing requested)!")
 		os.Exit(1)
 	}
-	e2e.RunE2ETests(*authConfig, *certDir, *host, *repoRoot, *provider, *orderseed, *times, *reportDir, testList)
+	gceConfig := &e2e.GCEConfig{
+		ProjectID:  *gceProject,
+		Zone:       *gceZone,
+		MasterName: *masterName,
+	}
+	e2e.RunE2ETests(*authConfig, *certDir, *host, *repoRoot, *provider, gceConfig, *orderseed, *times, *reportDir, testList)
 }

hack/ginkgo-e2e.sh

@@ -32,8 +32,6 @@ source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
 prepare-e2e
 
 detect-master >/dev/null
-# Export the master name to make it available to the ginkgo tests.
-export KUBE_MASTER
 
 # Detect the OS name/arch so that we can find our binary
 case "$(uname -s)" in
@@ -79,6 +77,9 @@ locations=(
 )
 e2e=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
 
+PROJECT=""
+ZONE=""
+KUBE_MASTER=""
 if [[ "$KUBERNETES_PROVIDER" == "vagrant" ]]; then
   # When we are using vagrant it has hard coded auth.  We repeat that here so that
   # we don't clobber auth that might be used for a publicly facing cluster.
@@ -93,15 +94,10 @@ elif [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
     "--auth_config=${cfg_dir}/kubernetes_auth"
     "--cert_dir=${cfg_dir}"
   )
-  # Export the project and zone env vars to make them available to the tests.
-  export PROJECT
-  export ZONE
 elif [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
   auth_config=(
     "--auth_config=${HOME}/.kube/${PROJECT}_${INSTANCE_PREFIX}/kubernetes_auth"
   )
-  export PROJECT
-  export ZONE
 else
   auth_config=()
 fi
@@ -109,5 +105,8 @@ fi
 "${e2e}" "${auth_config[@]:+${auth_config[@]}}" \
   --host="https://${KUBE_MASTER_IP-}" \
   --provider="${KUBERNETES_PROVIDER}" \
+  --gce_project="${PROJECT}" \
+  --gce_zone="${ZONE}" \
+  --kube_master="${KUBE_MASTER}" \
   ${E2E_REPORT_DIR+"--report_dir=${E2E_REPORT_DIR}"} \
   "${@:-}"

test/e2e/certs.go

@@ -18,7 +18,6 @@ package e2e
 
 import (
 	"fmt"
-	"os"
 	"os/exec"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
@@ -42,25 +41,10 @@ var _ = Describe("MasterCerts", func() {
 			return
 		}
 
-		// gcloud requires the project, zone and master VM name, it can't SSH
-		// based only on the host IP. Unfortunately, you can't SSH into a GCE VM
-		// without using gcloud SSH or doing out-of-band configuration.
-		project := os.Getenv("PROJECT")
-		if project == "" {
-			Fail(fmt.Sprintf("Error getting PROJECT environment variable"))
-		}
-		zone := os.Getenv("ZONE")
-		if zone == "" {
-			Fail(fmt.Sprintf("Error getting ZONE environment variable"))
-		}
-		master := os.Getenv("KUBE_MASTER")
-		if master == "" {
-			Fail(fmt.Sprintf("Error getting KUBE_MASTER environment variable"))
-		}
-
 		for _, certFile := range []string{"kubecfg.key", "kubecfg.crt", "ca.crt"} {
-			cmd := exec.Command("gcloud", "compute", "ssh", "--project", project, "--zone", zone,
-				master, "--command", fmt.Sprintf("ls /srv/kubernetes/%s", certFile))
+			cmd := exec.Command("gcloud", "compute", "ssh", "--project", testContext.gceConfig.ProjectID,
+				"--zone", testContext.gceConfig.Zone, testContext.gceConfig.MasterName,
+				"--command", fmt.Sprintf("ls /srv/kubernetes/%s", certFile))
 			if _, err := cmd.CombinedOutput(); err != nil {
 				Fail(fmt.Sprintf("Error checking for cert file %s on master: %v", certFile, err))
 			}

test/e2e/driver.go

@@ -31,6 +31,12 @@ import (
 
 type testResult bool
 
+type GCEConfig struct {
+	ProjectID  string
+	Zone       string
+	MasterName string
+}
+
 func init() {
 	// Turn on verbose by default to get spec names
 	config.DefaultReporterConfig.Verbose = true
@@ -46,8 +52,8 @@ func (t *testResult) Fail() { *t = false }
 
 // Run each Go end-to-end-test. This function assumes the
 // creation of a test cluster.
-func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, orderseed int64, times int, reportDir string, testList []string) {
-	testContext = testContextType{authConfig, certDir, host, repoRoot, provider}
+func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, gceConfig *GCEConfig, orderseed int64, times int, reportDir string, testList []string) {
+	testContext = testContextType{authConfig, certDir, host, repoRoot, provider, *gceConfig}
 	util.ReallyCrash = true
 	util.InitLogs()
 	defer util.FlushLogs()

test/e2e/util.go

@@ -37,6 +37,7 @@ type testContextType struct {
 	host       string
 	repoRoot   string
 	provider   string
+	gceConfig  GCEConfig
 }
 
 var testContext testContextType