From 0f0c0700ff5863d68b34e4d0412b8312a56f24b2 Mon Sep 17 00:00:00 2001 From: jayunit100 Date: Mon, 20 Apr 2015 15:51:16 -0400 Subject: [PATCH] E2E: Add Api Server option to kubectl --- test/e2e/kubectl.go | 2 +- test/e2e/util.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 84e0f0c6aa3..9c0712ff52a 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -54,7 +54,7 @@ var _ = Describe("kubectl", func() { Describe("update-demo", func() { var ( - updateDemoRoot = filepath.Join(testContext.RepoRoot, "examples/update-demo/v1beta3") + updateDemoRoot = filepath.Join(testContext.RepoRoot, "examples/update-demo") nautilusPath = filepath.Join(updateDemoRoot, "nautilus-rc.yaml") kittenPath = filepath.Join(updateDemoRoot, "kitten-rc.yaml") ) diff --git a/test/e2e/util.go b/test/e2e/util.go index 7f024ad301e..bec437a3185 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -274,9 +274,16 @@ func kubectlCmd(args ...string) *exec.Cmd { defaultArgs := []string{} if testContext.KubeConfig != "" { defaultArgs = append(defaultArgs, "--"+clientcmd.RecommendedConfigPathFlag+"="+testContext.KubeConfig) + + // Reference the KubeContext if testContext.KubeContext != "" { defaultArgs = append(defaultArgs, "--"+clientcmd.FlagContext+"="+testContext.KubeContext) } + + // Reference a --server option so tests can run anywhere. + if testContext.Host != "" { + defaultArgs = append(defaultArgs, "--"+clientcmd.FlagAPIServer+"="+testContext.Host) + } } else { defaultArgs = append(defaultArgs, "--"+clientcmd.FlagAuthPath+"="+testContext.AuthConfig) if testContext.CertDir != "" {