github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/kubectl.go
View File

@ -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") {

2
test/e2e/testing-manifests/kubectl/kubectl-in-pod.json
View File

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