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
a2c029f6
Commit
a2c029f6
authored
Apr 12, 2018
by
WanLinghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.fix kubectl get * --all-namespaces
namespace miss error 2.also add a test case modified: pkg/kubectl/cmd/get/get.go modified: hack/make-rules/test-cmd-util.sh
parent
62b58e62
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
0 deletions
+30
-0
test-cmd-util.sh
hack/make-rules/test-cmd-util.sh
+14
-0
get.go
pkg/kubectl/cmd/get/get.go
+16
-0
No files found.
hack/make-rules/test-cmd-util.sh
View file @
a2c029f6
...
...
@@ -4474,6 +4474,20 @@ run_kubectl_all_namespace_tests() {
# Command
kubectl get pods
--all-namespaces
--namespace
=
default
### Check --all-namespaces option shows namespaces
# Create objects in multiple namespaces
kubectl create
"
${
kube_flags
[@]
}
"
namespace all-ns-test-1
kubectl create
"
${
kube_flags
[@]
}
"
serviceaccount
test
-n
all-ns-test-1
kubectl create
"
${
kube_flags
[@]
}
"
namespace all-ns-test-2
kubectl create
"
${
kube_flags
[@]
}
"
serviceaccount
test
-n
all-ns-test-2
# Ensure listing across namespaces displays the namespace
output_message
=
$(
kubectl get serviceaccounts
--all-namespaces
"
${
kube_flags
[@]
}
"
)
kube::test::if_has_string
"
${
output_message
}
"
"all-ns-test-1"
kube::test::if_has_string
"
${
output_message
}
"
"all-ns-test-2"
# Clean up
kubectl delete
"
${
kube_flags
[@]
}
"
namespace all-ns-test-1
kubectl delete
"
${
kube_flags
[@]
}
"
namespace all-ns-test-2
### Clean up
# Pre-condition: valid-pod exists
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
'valid-pod:'
...
...
pkg/kubectl/cmd/get/get.go
View file @
a2c029f6
...
...
@@ -614,6 +614,22 @@ func (o *GetOptions) decodeIntoTable(encoder runtime.Encoder, obj runtime.Object
return
nil
,
err
}
for
i
:=
range
table
.
Rows
{
row
:=
&
table
.
Rows
[
i
]
if
row
.
Object
.
Raw
==
nil
||
row
.
Object
.
Object
!=
nil
{
//if row already has Object.Object
//we don't change it
continue
}
converted
,
err
:=
runtime
.
Decode
(
unstructured
.
UnstructuredJSONScheme
,
row
.
Object
.
Raw
)
if
err
!=
nil
{
//if error happens, we just continue
continue
}
row
.
Object
.
Object
=
converted
}
return
table
,
nil
}
...
...
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