From 339c361ca0156cbf2be5aa64f52a0afd332f5708 Mon Sep 17 00:00:00 2001 From: Paul Barfuss Date: Tue, 7 Dec 2021 15:13:39 -0500 Subject: [PATCH 1/2] kubectl: fix hard-coded value in zsh completion --- staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go b/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go index 5a2839c662b1..d13bba3bff81 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go @@ -17,6 +17,7 @@ limitations under the License. package completion import ( + "fmt" "io" "github.com/spf13/cobra" @@ -170,7 +171,8 @@ func runCompletionBash(out io.Writer, boilerPlate string, kubectl *cobra.Command } func runCompletionZsh(out io.Writer, boilerPlate string, kubectl *cobra.Command) error { - zshHead := "#compdef kubectl\ncompdef _kubectl kubectl\n" + commandName := kubectl.Name() + zshHead := fmt.Sprintf("#compdef %[1]s\ncompdef _%[1]s %[1]s\n", commandName) out.Write([]byte(zshHead)) if len(boilerPlate) == 0 { From 77be26c3b83dd28be450c8790ecee823750f9a8c Mon Sep 17 00:00:00 2001 From: Paul Barfuss Date: Fri, 10 Dec 2021 15:58:52 -0500 Subject: [PATCH 2/2] Replace hardcoded kubectl with kubectl.Name() --- staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go b/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go index d13bba3bff81..8018e93fbca3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/completion/completion.go @@ -171,8 +171,7 @@ func runCompletionBash(out io.Writer, boilerPlate string, kubectl *cobra.Command } func runCompletionZsh(out io.Writer, boilerPlate string, kubectl *cobra.Command) error { - commandName := kubectl.Name() - zshHead := fmt.Sprintf("#compdef %[1]s\ncompdef _%[1]s %[1]s\n", commandName) + zshHead := fmt.Sprintf("#compdef %[1]s\ncompdef _%[1]s %[1]s\n", kubectl.Name()) out.Write([]byte(zshHead)) if len(boilerPlate) == 0 {