【修改】k8s 配置

apps/devops/services/k8s/Init/container.go

@@ -1,9 +1,15 @@
 package Init
 
 import (
+	"context"
 	"errors"
 	"fmt"
+	"io"
+	"io/ioutil"
+	"k8s.io/client-go/dynamic"
+	"os"
 	"pandax/base/global"
+	"path/filepath"
 
 	"go.uber.org/zap"
 	"k8s.io/client-go/kubernetes"
@@ -12,30 +18,67 @@ import (
 )
 
 // GetK8sClient 获取k8s Client
-func GetK8sClient(k8sConf string) (*kubernetes.Clientset, error) {
-
-	config, err := clientcmd.RESTConfigFromKubeConfig([]byte(k8sConf))
-	// skips the validity check for the server's certificate. This will make your HTTPS connections insecure.
-	// config.TLSClientConfig.Insecure = true
-	if err != nil {
-		global.Log.Error("KubeConfig内容错误", zap.Any("err", err))
-		return nil, errors.New("KubeConfig内容错误")
+func GetK8sClient(ctx context.Context, kubeConfig string) (*kubernetes.Clientset, error) {
+	var config *rest.Config
+	var err error
+	if kubeConfig != "" {
+		clientConfig := GetClientConfig(kubeConfig, nil)
+		config, err = clientConfig.ClientConfig()
+		if err != nil {
+			return nil, errors.New("KubeConfig内容错误")
+		}
+	} else {
+		config, err = rest.InClusterConfig()
+		if err != nil {
+			return nil, errors.New("KubeConfig内容错误")
+		}
 	}
 
+	//config, err := clientcmd.RESTConfigFromKubeConfig([]byte(k8sConf))
+	// skips the validity check for the server's certificate. This will make your HTTPS connections insecure.
+	// config.TLSClientConfig.Insecure = true
 	clientSet, err := kubernetes.NewForConfig(config)
 	if err != nil {
 		global.Log.Error("创建Client失败", zap.Any("err", err))
 		return nil, errors.New("创建Client失败！")
 	}
+	_, err = dynamic.NewForConfig(config)
+	if err != nil {
+		return nil, fmt.Errorf("kubernetes dynamic client create error:%s", err.Error())
+	}
 	return clientSet, nil
 }
 
-// GetRestConf 获取k8s RESTConfig
-func GetRestConf(k8sConf string) (restConf *rest.Config, err error) {
-
-	if restConf, err = clientcmd.RESTConfigFromKubeConfig([]byte(k8sConf)); err != nil {
-		fmt.Println("err: ", err)
-		return nil, err
-	}
-	return restConf, nil
+func GetClientConfig(kubeConfig string, reader io.Reader) clientcmd.ClientConfig {
+	loadingRules := GetLoadingRules(kubeConfig)
+	overrides := &clientcmd.ConfigOverrides{ClusterDefaults: clientcmd.ClusterDefaults}
+	return clientcmd.NewInteractiveDeferredLoadingClientConfig(loadingRules, overrides, reader)
+}
+
+func GetLoadingRules(kubeConfig string) *clientcmd.ClientConfigLoadingRules {
+	loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
+	loadingRules.DefaultClientConfig = &clientcmd.DefaultClientConfig
+	if kubeConfig != "" {
+		loadingRules.ExplicitPath = kubeConfig
+	}
+
+	var otherFiles []string
+	homeDir, err := os.UserHomeDir()
+	if err == nil {
+		otherFiles = append(otherFiles, filepath.Join(homeDir, ".kube", "k3s.yaml"))
+	}
+	otherFiles = append(otherFiles, "/etc/rancher/k3s/k3s.yaml")
+	loadingRules.Precedence = append(loadingRules.Precedence, canRead(otherFiles)...)
+
+	return loadingRules
+}
+
+func canRead(files []string) (result []string) {
+	for _, f := range files {
+		_, err := ioutil.ReadFile(f)
+		if err == nil {
+			result = append(result, f)
+		}
+	}
+	return
 }