diff --git a/go.mod b/go.mod
index 19d780d8..f604b5ce 100644
--- a/go.mod
+++ b/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/sys v0.0.0-20211019181941-9d821ace8654
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.0.0-20220104023900-7289fed567b9
+	k8s.io/api v0.0.0-20220107211824-37748cca5822
 	k8s.io/apimachinery v0.0.0-20220106211624-e9b426bb59b7
 	k8s.io/cli-runtime v0.0.0-20211222013952-f68ccb11a272
 	k8s.io/client-go v0.0.0-20220105172055-255c79651356
@@ -47,7 +47,7 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20220104023900-7289fed567b9
+	k8s.io/api => k8s.io/api v0.0.0-20220107211824-37748cca5822
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220106211624-e9b426bb59b7
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211222013952-f68ccb11a272
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20220105172055-255c79651356
diff --git a/go.sum b/go.sum
index 0668bc5c..b33efff4 100644
--- a/go.sum
+++ b/go.sum
@@ -909,8 +909,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20220104023900-7289fed567b9 h1:HghyPmUKTDSohvaoMdU8NmSTLV3GMrwWfUjJX33U7aE=
-k8s.io/api v0.0.0-20220104023900-7289fed567b9/go.mod h1:nKerto6bPj5aBqqPdGEHYEtwdsvWd6LAIUE0QPgQzoE=
+k8s.io/api v0.0.0-20220107211824-37748cca5822 h1:d1KQR08t9t+gqf4tpUPjY8fnKCk1ZMSljZZxP2XfWXc=
+k8s.io/api v0.0.0-20220107211824-37748cca5822/go.mod h1:+wrzIHIZSa2Xtc2kuTFMJ6SjVuB2/f8qmhcmVEkhHM8=
 k8s.io/apimachinery v0.0.0-20220106211624-e9b426bb59b7 h1:IHAn08cVL/qPDtyS6VLVORr8iKiJl9UJgTFpPxM+gNs=
 k8s.io/apimachinery v0.0.0-20220106211624-e9b426bb59b7/go.mod h1:vcZg0n5bcYADuuKUza0y2en2OCM/UIxFaAI7N0cN6Ik=
 k8s.io/cli-runtime v0.0.0-20211222013952-f68ccb11a272 h1:8JQH3oCrRz1UNiymMrWpI8fVsSfb9NKCQVQ8cIWVsWg=
diff --git a/pkg/cmd/config/create_context.go b/pkg/cmd/config/create_context.go
index ab745379..fd636b5a 100644
--- a/pkg/cmd/config/create_context.go
+++ b/pkg/cmd/config/create_context.go
@@ -27,6 +27,7 @@ import (
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	cliflag "k8s.io/component-base/cli/flag"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
+	"k8s.io/kubectl/pkg/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 )
@@ -61,6 +62,7 @@ func NewCmdConfigSetContext(out io.Writer, configAccess clientcmd.ConfigAccess)
 		Short:                 i18n.T("Set a context entry in kubeconfig"),
 		Long:                  createContextLong,
 		Example:               createContextExample,
+		ValidArgsFunction:     util.ContextCompletionFunc,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(options.complete(cmd))
 			name, exists, err := options.run()