mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #31719 from nikhiljindal/kubectlHelp
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:
		@@ -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')
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user