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

Merge pull request #117901 from ardaguclu/use-getter-allowed-cmds

Browse Source 
Use getter function for plugin subcommand resolution
This commit is contained in:
Kubernetes Prow Robot 2023-05-15 02:27:27 -07:00 committed by GitHub
commit 714b165af8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/kubectl/pkg/cmd/cmd.go
View File

@ -84,10 +84,6 @@ import (
const kubectlCmdHeaders = "KUBECTL_COMMAND_HEADERS" const kubectlCmdHeaders = "KUBECTL_COMMAND_HEADERS"
var (
allowedCmdsSubcommandPlugin = map[string]struct{}{"create": {}}
)
type KubectlOptions struct { type KubectlOptions struct {
PluginHandler PluginHandler PluginHandler PluginHandler
Arguments []string Arguments []string
@ -146,7 +142,7 @@ func NewDefaultKubectlCommandWithArgs(o KubectlOptions) *cobra.Command {
if cmdutil.CmdPluginAsSubcommand.IsEnabled() { if cmdutil.CmdPluginAsSubcommand.IsEnabled() {
// Command exists(e.g. kubectl create), but it is not certain that // Command exists(e.g. kubectl create), but it is not certain that
// subcommand also exists (e.g. kubectl create networkpolicy) // subcommand also exists (e.g. kubectl create networkpolicy)
if _, ok := allowedCmdsSubcommandPlugin[foundCmd.Name()]; ok { if IsSubcommandPluginAllowed(foundCmd.Name()) {
var subcommand string var subcommand string
for _, arg := range foundArgs { // first "non-flag" argument as subcommand for _, arg := range foundArgs { // first "non-flag" argument as subcommand
if !strings.HasPrefix(arg, "-") { if !strings.HasPrefix(arg, "-") {
@ -176,6 +172,14 @@ func NewDefaultKubectlCommandWithArgs(o KubectlOptions) *cobra.Command {
return cmd return cmd
} }
// IsSubcommandPluginAllowed returns the given command is allowed
// to use plugin as subcommand if the subcommand does not exist as builtin.
func IsSubcommandPluginAllowed(foundCmd string) bool {
allowedCmds := map[string]struct{}{"create": {}}
_, ok := allowedCmds[foundCmd]
return ok
}
// PluginHandler is capable of parsing command line arguments // PluginHandler is capable of parsing command line arguments
// and performing executable filename lookups to search // and performing executable filename lookups to search
// for valid plugin files, and execute found plugins. // for valid plugin files, and execute found plugins.