opensource/flux2
1
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2025-11-01 18:26:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add kubeconfig global flag

Browse Source
This commit is contained in:
stefanprodan
2020-04-24 15:07:03 +03:00
parent 4f449a1ffd
commit e304059299
2 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/tk/check.go
View File

@ -4,12 +4,8 @@ import (
"fmt"
"os"
"os/exec"
"path/filepath"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/client-go/tools/clientcmd"
)
var checkCmd = &cobra.Command{
@ -17,24 +13,16 @@ var checkCmd = &cobra.Command{
Short: "Check for potential problems",
Long: `
The check command will perform a series of checks to validate that
the local environment and Kubernetes cluster are configured correctly.`,
the local environment is configured correctly.`,
Example: ` check --pre`,
RunE: runCheckCmd,
}
var (
kubeconfig string
checkPre bool
checkPre bool
)
func init() {
if home := homeDir(); home != "" {
checkCmd.Flags().StringVarP(&kubeconfig, "kubeconfig", "", filepath.Join(home, ".kube", "config"),
"path to the kubeconfig file")
} else {
checkCmd.Flags().StringVarP(&kubeconfig, "kubeconfig", "", "",
"absolute path to the kubeconfig file")
}
checkCmd.Flags().BoolVarP(&checkPre, "pre", "", false,
"only run pre-installation checks")
@ -58,13 +46,6 @@ func runCheckCmd(cmd *cobra.Command, args []string) error {
return nil
}
func homeDir() string {
if h := os.Getenv("HOME"); h != "" {
return h
}
return os.Getenv("USERPROFILE") // windows
}
func checkLocal() bool {
ok := true
for _, cmd := range []string{"kubectl", "kustomize"} {
@ -80,13 +61,7 @@ func checkLocal() bool {
}
func checkRemote() bool {
config, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
if err != nil {
fmt.Println(`✗`, "kubernetes client initialization failed", err.Error())
return false
}
client, err := kubernetes.NewForConfig(config)
client, err := NewKubernetesClient()
if err != nil {
fmt.Println(`✗`, "kubernetes client initialization failed", err.Error())
return false

39
cmd/tk/main.go
View File

@ -4,9 +4,13 @@ import (
"fmt"
"log"
"os"
"path/filepath"
"strings"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/client-go/tools/clientcmd"
)
var VERSION = "0.0.1"
@ -17,6 +21,20 @@ var rootCmd = &cobra.Command{
Version: VERSION,
}
var (
kubeconfig string
)
func init() {
if home := homeDir(); home != "" {
rootCmd.PersistentFlags().StringVarP(&kubeconfig, "kubeconfig", "", filepath.Join(home, ".kube", "config"),
"path to the kubeconfig file")
} else {
checkCmd.PersistentFlags().StringVarP(&kubeconfig, "kubeconfig", "", "",
"absolute path to the kubeconfig file")
}
}
func main() {
log.SetFlags(0)
@ -27,3 +45,24 @@ func main() {
os.Exit(1)
}
}
func homeDir() string {
if h := os.Getenv("HOME"); h != "" {
return h
}
return os.Getenv("USERPROFILE") // windows
}
func NewKubernetesClient() (*kubernetes.Clientset, error) {
config, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
if err != nil {
return nil, err
}
client, err := kubernetes.NewForConfig(config)
if err != nil {
return nil, err
}
return client, nil
}