github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15667 from JanetKuo/kubectl-watch-list

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-19 06:28:35 -07:00
commit 77207d75e1
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/test-cmd.sh
View File

@ -808,7 +808,6 @@ __EOF__
###################### ######################
kube::log::status "Testing kubectl(${version}:multiple resources)" kube::log::status "Testing kubectl(${version}:multiple resources)"
# TODO: add test for types like ReplicationControllerList, ServiceList
FILES="hack/testdata/multi-resource-yaml FILES="hack/testdata/multi-resource-yaml
hack/testdata/multi-resource-list hack/testdata/multi-resource-list
@ -866,8 +865,13 @@ __EOF__
fi fi
fi fi
# Command # Command
# kubectl create -f "${file}" "${kube_flags[@]}" # test fails here now
kubectl get -f "${file}" "${kube_flags[@]}" kubectl get -f "${file}" "${kube_flags[@]}"
# Command: watching multiple resources should return "not supported" error
WATCH_ERROR_FILE="${KUBE_TEMP}/kubectl-watch-error"
kubectl get -f "${file}" "${kube_flags[@]}" "--watch" 2> ${WATCH_ERROR_FILE} || true
if ! grep -q "watch is only supported on individual resources and resource collections" "${WATCH_ERROR_FILE}"; then
kube::log::error_exit "kubectl watch multiple resource returns unexpected error or non-error: $(cat ${WATCH_ERROR_FILE})" "1"
fi
kubectl describe -f "${file}" "${kube_flags[@]}" kubectl describe -f "${file}" "${kube_flags[@]}"
# Command # Command
kubectl replace -f $replace_file --force "${kube_flags[@]}" kubectl replace -f $replace_file --force "${kube_flags[@]}"

2
pkg/kubectl/cmd/get.go
View File

@ -146,7 +146,7 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
return err return err
} }
if len(infos) != 1 { if len(infos) != 1 {
return fmt.Errorf("watch is only supported on a single resource - %d resources were found", len(infos)) return fmt.Errorf("watch is only supported on individual resources and resource collections - %d resources were found", len(infos))
} }
info := infos[0] info := infos[0]
mapping := info.ResourceMapping() mapping := info.ResourceMapping()

2
pkg/kubectl/resource/result.go
View File

@ -199,7 +199,7 @@ func (r *Result) Watch(resourceVersion string) (watch.Interface, error) {
return nil, err return nil, err
} }
if len(info) != 1 { if len(info) != 1 {
return nil, fmt.Errorf("watch is only supported on a single resource - %d resources were found", len(info)) return nil, fmt.Errorf("watch is only supported on individual resources and resource collections - %d resources were found", len(info))
} }
return info[0].Watch(resourceVersion) return info[0].Watch(resourceVersion)
} }

3
pkg/kubectl/resource/visitor.go
View File

@ -564,6 +564,9 @@ func RetrieveLatest(info *Info, err error) error {
if err != nil { if err != nil {
return err return err
} }
if runtime.IsListType(info.Object) {
return fmt.Errorf("watch is only supported on individual resources and resource collections, but a list of resources is found")
}
if len(info.Name) == 0 { if len(info.Name) == 0 {
return nil return nil
} }