Revert "Fix path to kubectl on host in kubectl-in-pod"

pull/6/head
Saad Ali 2016-11-16 20:44:25 -08:00 committed by GitHub
parent 01897bb3c0
commit 2aa2cf3800
2 changed files with 2 additions and 9 deletions

View File

@ -566,15 +566,8 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
framework.SkipUnlessProviderIs("gke")
nsFlag := fmt.Sprintf("--namespace=%v", ns)
podJson := readTestFileOrDie(kubectlInPodFilename)
// Replace the host path to kubectl in json
podString := strings.Replace(string(podJson),
"$KUBECTL_PATH",
framework.TestContext.KubectlPath,
1)
By("validating api verions")
framework.RunKubectlOrDieInput(podString, "create", "-f", "-", nsFlag)
framework.RunKubectlOrDieInput(string(podJson), "create", "-f", "-", nsFlag)
err := wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
output := framework.RunKubectlOrDie("get", "pods/kubectl-in-pod", nsFlag)
if strings.Contains(output, "Running") {

View File

@ -20,7 +20,7 @@
],
"volumes": [{
"name":"kubectl",
"hostPath":{"path": "$KUBECTL_PATH"}
"hostPath":{"path": "/usr/bin/kubectl"}
}]
}
}