github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

fix --watch on multiple requests

Browse Source
This commit is contained in:
juanvallejo 2018-02-07 16:12:41 -05:00
parent 15dbd4e2ae
commit aea8deee03
No known key found for this signature in database
GPG Key ID: 7D2C958002D6448D
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hack/make-rules/test-cmd-util.sh
View File

@ -1430,6 +1430,18 @@ run_kubectl_get_tests() {
# Post-condition: Check if we get a limit and continue # Post-condition: Check if we get a limit and continue
kube::test::if_has_string "${output_message}" "/clusterroles?limit=500 200 OK" kube::test::if_has_string "${output_message}" "/clusterroles?limit=500 200 OK"
### Test kubectl get chunk size does not result in a --watch error when resource list is served in multiple chunks
# Pre-condition: no ConfigMaps exist
kube::test::get_object_assert configmap "{{range.items}}{{$id_field}}:{{end}}" ''
# Post-condition: Create three configmaps and ensure that we can --watch them with a --chunk-size of 1
kubectl create cm one "${kube_flags[@]}"
kubectl create cm two "${kube_flags[@]}"
kubectl create cm three "${kube_flags[@]}"
output_message=$(kubectl get configmap --chunk-size=1 --watch --request-timeout=1s 2>&1 "${kube_flags[@]}")
kube::test::if_has_not_string "${output_message}" "watch is only supported on individual resources"
output_message=$(kubectl get configmap --chunk-size=1 --watch-only --request-timeout=1s 2>&1 "${kube_flags[@]}")
kube::test::if_has_not_string "${output_message}" "watch is only supported on individual resources"
### Test --allow-missing-template-keys ### Test --allow-missing-template-keys
# Pre-condition: no POD exists # Pre-condition: no POD exists
create_and_use_new_namespace create_and_use_new_namespace

21
pkg/kubectl/cmd/resource/get.go
View File

@ -463,8 +463,25 @@ func (options *GetOptions) watch(f cmdutil.Factory, cmd *cobra.Command, args []s
if err != nil { if err != nil {
return err return err
} }
if len(infos) != 1 { if len(infos) > 1 {
return i18n.Errorf("watch is only supported on individual resources and resource collections - %d resources were found", len(infos)) gvk := infos[0].Mapping.GroupVersionKind
uniqueGVKs := 1
// If requesting a resource count greater than a request's --chunk-size,
// we will end up making multiple requests to the server, with each
// request producing its own "Info" object. Although overall we are
// dealing with a single resource type, we will end up with multiple
// infos returned by the builder. To handle this case, only fail if we
// have at least one info with a different GVK than the others.
for _, info := range infos {
if info.Mapping.GroupVersionKind != gvk {
uniqueGVKs++
}
}
if uniqueGVKs > 1 {
return i18n.Errorf("watch is only supported on individual resources and resource collections - %d resources were found", uniqueGVKs)
}
} }
filterOpts := cmdutil.ExtractCmdPrintOptions(cmd, options.AllNamespaces) filterOpts := cmdutil.ExtractCmdPrintOptions(cmd, options.AllNamespaces)