Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
db72f92c
Commit
db72f92c
authored
Nov 16, 2016
by
Saad Ali
Committed by
GitHub
Nov 16, 2016
Browse files
Options
Browse Files
Download
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
9 deletions
+2
-9
kubectl.go
test/e2e/kubectl.go
+1
-8
kubectl-in-pod.json
test/e2e/testing-manifests/kubectl/kubectl-in-pod.json
+1
-1
No files found.
test/e2e/kubectl.go
View file @
db72f92c
...
@@ -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"
)
{
...
...
test/e2e/testing-manifests/kubectl/kubectl-in-pod.json
View file @
db72f92c
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
],
],
"volumes"
:
[{
"volumes"
:
[{
"name"
:
"kubectl"
,
"name"
:
"kubectl"
,
"hostPath"
:{
"path"
:
"
$KUBECTL_PATH
"
}
"hostPath"
:{
"path"
:
"
/usr/bin/kubectl
"
}
}]
}]
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment