mirror of https://github.com/k3s-io/k3s
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.shpull/8/head
parent
62b58e625e
commit
a2c029f6c3
|
@ -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:'
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue