Commit db72f92c authored by Saad Ali's avatar Saad Ali Committed by GitHub

Merge pull request #36971 from kubernetes/revert-36864-fix-path-to-kubectl-in-gke-test

Revert "Fix path to kubectl on host in kubectl-in-pod"
parents 01897bb3 2aa2cf38
...@@ -566,15 +566,8 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -566,15 +566,8 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
framework.SkipUnlessProviderIs("gke") framework.SkipUnlessProviderIs("gke")
nsFlag := fmt.Sprintf("--namespace=%v", ns) nsFlag := fmt.Sprintf("--namespace=%v", ns)
podJson := readTestFileOrDie(kubectlInPodFilename) 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") 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) { err := wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
output := framework.RunKubectlOrDie("get", "pods/kubectl-in-pod", nsFlag) output := framework.RunKubectlOrDie("get", "pods/kubectl-in-pod", nsFlag)
if strings.Contains(output, "Running") { if strings.Contains(output, "Running") {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
], ],
"volumes": [{ "volumes": [{
"name":"kubectl", "name":"kubectl",
"hostPath":{"path": "$KUBECTL_PATH"} "hostPath":{"path": "/usr/bin/kubectl"}
}] }]
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment