github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 12:48:51 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex Robinson
2015-02-18 15:12:20 -08:00
parent f946aa887b
commit 94161a44ee
5 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/e2e/certs.go
View File

@@ -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))
}