Call the cluster/kubectl.sh wrapper in e2e tests.

The ginkgo wrapper script used to set up the path so that tests would
find the appropriate kubectl binary, but this seems like a cleaner way
to achieve the same result.
pull/6/head
Jeff Grafton 2015-04-28 14:57:56 -07:00
parent f8569dc5d3
commit ae019935b3
1 changed files with 2 additions and 3 deletions

View File

@ -300,8 +300,7 @@ func validateController(c *client.Client, containerImage string, replicas int, c
Failf("Timed out after %v seconds waiting for %s pods to reach valid state", podStartTimeout.Seconds(), testname)
}
// kubectlCmd runs the kubectl executable.
// kubectlCmd runs the kubectl executable.
// kubectlCmd runs the kubectl executable through the helper script.
func kubectlCmd(args ...string) *exec.Cmd {
defaultArgs := []string{}
@ -329,7 +328,7 @@ func kubectlCmd(args ...string) *exec.Cmd {
kubectlArgs := append(defaultArgs, args...)
//TODO: the "kubectl" path string might be worth externalizing into an (optional) ginko arg.
cmd := exec.Command("kubectl", kubectlArgs...)
cmd := exec.Command(filepath.Join(testContext.RepoRoot, "cluster/kubectl.sh"), kubectlArgs...)
Logf("Running '%s %s'", cmd.Path, strings.Join(cmd.Args, " "))
return cmd
}