github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31719 from nikhiljindal/kubectlHelp

Browse Source 
Automatic merge from submit-queue

Adding clusters to the list of valid resources printed by kubectl help

Ref https://github.com/kubernetes/kubernetes/issues/25592

Adding clusters to the list of valid resources printed by kubectl help with a clear message that it only works when talking to federation apiserver.
In future, we should replace the hard coded list with a dynamic list generated using APIServer's discovery API.

```release-note
Adding clusters to the list of valid resources printed by kubectl help
```


cc @kubernetes/kubectl @kubernetes/sig-cluster-federation
This commit is contained in:
Kubernetes Submit Queue 2016-08-31 17:52:53 -07:00 committed by GitHub
commit 3d30787abc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,9 @@ __custom_func() {
// If you add a resource to this list, please also take a look at pkg/kubectl/kubectl.go // If you add a resource to this list, please also take a look at pkg/kubectl/kubectl.go
// and add a short forms entry in expandResourceShortcut() when appropriate. // and add a short forms entry in expandResourceShortcut() when appropriate.
// TODO: This should be populated using the discovery information from apiserver.
valid_resources = `Valid resource types include: valid_resources = `Valid resource types include:
* clusters (valid only for federation apiservers)
* componentstatuses (aka 'cs') * componentstatuses (aka 'cs')
* configmaps (aka 'cm') * configmaps (aka 'cm')
* daemonsets (aka 'ds') * daemonsets (aka 'ds')