From 2ad213b923c4475efe7d76dfdcbb8323616a6a3a Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 08 六月 2023 14:30:37 +0800
Subject: [PATCH] fix 修改 util Cluster 根据ClusterId 保存并读取kube config
---
src/util/util.go | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/util/util.go b/src/util/util.go
index cb8dc2c..9e0170e 100644
--- a/src/util/util.go
+++ b/src/util/util.go
@@ -3,13 +3,11 @@
import (
"context"
"crypto/tls"
- "flag"
"fmt"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"net/http"
"os"
- "path/filepath"
"time"
"golang.org/x/crypto/ssh"
@@ -150,17 +148,19 @@
return nil
}
-var kubeConfig *string
+var kubeConfig string
-func GetClient() (*kubernetes.Clientset, error) {
+func GetClient(cluster string) (*kubernetes.Clientset, error) {
// 閰嶇疆 Kubernetes 闆嗙兢鐨� kubeconfig 璺緞
- if kubeConfig == nil {
- kubeConfig = flag.String("kubeconfig", filepath.Join(HomeDir(), ".kube", "config"), "kubeconfig file")
- flag.Parse()
- }
+ //if kubeConfig == nil {
+ // kubeConfig = flag.String("kubeconfig", filepath.Join(HomeDir(), ".kube", cluster, "config"), "kubeconfig file")
+ // flag.Parse()
+ //}
+
+ kubeConfig = fmt.Sprintf("%s/.kube/%s/config", HomeDir(), cluster)
// 鍒涘缓 Kubernetes 瀹㈡埛绔�
- config, err := clientcmd.BuildConfigFromFlags("", *kubeConfig)
+ config, err := clientcmd.BuildConfigFromFlags("", kubeConfig)
if err != nil {
panic(err.Error())
}
--
Gitblit v1.8.0