use genericclioptions package to handle kubeconfig

Use the same flagset that kubectl uses to select context and namespace, and generate the clientset from that. Fixes minio#884
bewing · May 14, 2024 · c5b4ced · c5b4ced
1 parent eedc5a8
commit c5b4ced
Show file tree

Hide file tree

Showing 12 changed files with 135 additions and 37 deletions.
diff --git a/cmd/directpv/main.go b/cmd/directpv/main.go
@@ -31,6 +31,7 @@ import (
 	"github.com/minio/directpv/pkg/installer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/klog/v2"
 )
 
@@ -49,10 +50,11 @@ var (
 	kubeconfig           = ""
 	conversionHealthzURL = ""
 	readinessPort        = consts.ReadinessPort
-
-	nodeID directpvtypes.NodeID
+	nodeID               directpvtypes.NodeID
 )
 
+var genericOptions *genericclioptions.ConfigFlags
+
 var mainCmd = &cobra.Command{
 	Use:           consts.AppName,
 	Short:         "Start " + consts.AppPrettyName + " controller and driver. This binary is usually executed by Kubernetes.",
@@ -72,7 +74,7 @@ var mainCmd = &cobra.Command{
 
 		nodeID = directpvtypes.NodeID(kubeNodeName)
 
-		client.Init()
+		client.Init(genericOptions)
 		return nil
 	},
 }
@@ -94,7 +96,9 @@ func init() {
 	flag.Set("logtostderr", "true")
 	flag.Set("alsologtostderr", "true")
 
-	mainCmd.PersistentFlags().StringVarP(&kubeconfig, "kubeconfig", "k", kubeconfig, "Path to the kubeconfig file to use for Kubernetes requests.")
+	genericOptions = genericclioptions.NewConfigFlags(true)
+	genericOptions.AddFlags(mainCmd.PersistentFlags())
+
 	mainCmd.PersistentFlags().StringVar(&identity, "identity", identity, "Identity of "+consts.AppPrettyName+" instances")
 	mainCmd.PersistentFlags().StringVar(&csiEndpoint, "csi-endpoint", csiEndpoint, "CSI endpoint")
 	mainCmd.PersistentFlags().StringVar(&kubeNodeName, "kube-node-name", kubeNodeName, "Kubernetes node name (MUST BE SET)")

diff --git a/cmd/kubectl-directpv/install.go b/cmd/kubectl-directpv/install.go
@@ -238,7 +238,7 @@ func getLegacyFlag(ctx context.Context) bool {
 		return true
 	}
 
-	legacyclient.Init()
+	legacyclient.Init(genericOptions)
 
 	for result := range legacyclient.ListVolumes(ctx) {
 		if result.Err != nil {

diff --git a/cmd/kubectl-directpv/main.go b/cmd/kubectl-directpv/main.go
@@ -28,13 +28,15 @@ import (
 	"github.com/minio/directpv/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/klog/v2"
 )
 
 // Version of this application populated by `go build`
 // e.g. $ go build -ldflags="-X main.Version=v4.0.1"
 var Version string
 
+var genericOptions *genericclioptions.ConfigFlags
 var disableInit bool
 
 var mainCmd = &cobra.Command{
@@ -48,7 +50,7 @@ var mainCmd = &cobra.Command{
 	Version: Version,
 	PersistentPreRunE: func(_ *cobra.Command, _ []string) error {
 		if !disableInit {
-			client.Init()
+			client.Init(genericOptions)
 		}
 		return nil
 	},
@@ -106,13 +108,6 @@ Use "{{.CommandPath}} [command] --help" for more information about this command.
 	flag.Set("logtostderr", "true")
 	flag.Set("alsologtostderr", "true")
 
-	mainCmd.PersistentFlags().StringVarP(
-		&kubeconfig,
-		"kubeconfig",
-		"",
-		kubeconfig,
-		"Path to the kubeconfig file to use for CLI requests",
-	)
 	mainCmd.PersistentFlags().BoolVarP(
 		&quietFlag,
 		"quiet",
@@ -121,6 +116,9 @@ Use "{{.CommandPath}} [command] --help" for more information about this command.
 		"Suppress printing error messages",
 	)
 
+	genericOptions = genericclioptions.NewConfigFlags(true)
+	genericOptions.AddFlags(mainCmd.PersistentFlags())
+
 	mainCmd.PersistentFlags().MarkHidden("alsologtostderr")
 	mainCmd.PersistentFlags().MarkHidden("add_dir_header")
 	mainCmd.PersistentFlags().MarkHidden("log_file")

diff --git a/cmd/kubectl-directpv/migrate.go b/cmd/kubectl-directpv/migrate.go
@@ -54,8 +54,9 @@ func init() {
 
 func migrateMain(ctx context.Context) {
 	if err := installer.Migrate(ctx, &installer.Args{
-		Quiet:  quietFlag,
-		Legacy: true,
+		Quiet:          quietFlag,
+		Legacy:         true,
+		GenericOptions: genericOptions,
 	}, false); err != nil {
 		utils.Eprintf(quietFlag, true, "migration failed; %v", err)
 		os.Exit(1)

diff --git a/go.mod b/go.mod
@@ -25,6 +25,7 @@ require (
 	k8s.io/api v0.28.7
 	k8s.io/apiextensions-apiserver v0.28.7
 	k8s.io/apimachinery v0.28.7
+	k8s.io/cli-runtime v0.28.7
 	k8s.io/client-go v0.28.7
 	k8s.io/klog/v2 v2.120.1
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
@@ -42,22 +43,27 @@ require (
 	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/btree v1.0.1 // indirect
 	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -68,12 +74,14 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/common v0.50.0 // indirect
 	github.com/prometheus/procfs v0.13.0 // indirect
@@ -85,6 +93,8 @@ require (
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/xlab/treeprint v1.2.0 // indirect
+	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/net v0.23.0 // indirect
@@ -102,5 +112,7 @@ require (
 	k8s.io/component-base v0.28.7 // indirect
 	k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )