From 0e22b2dfe7a24c528fb8ac58ece089bd032f5478 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 26 十二月 2023 17:49:34 +0800
Subject: [PATCH] 支持添加额外的env
---
src/main/main.go | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/main.go b/src/main/main.go
index 8897078..530cf63 100644
--- a/src/main/main.go
+++ b/src/main/main.go
@@ -77,7 +77,7 @@
clusterID, err := cluster.GetClusterID(rancherClusterConfig.RancherURL, rancherClusterConfig.BearerToken, clusterName)
if err != nil {
fmt.Printf("Cluster not found: %s %v\n", clusterName, err)
- err = cluster.CreateCluster(rancherClusterConfig, clusterName)
+ _, err = cluster.CreateCluster(rancherClusterConfig, clusterName)
if err != nil {
log.Fatalf("Failed to create cluster: %v", err)
}
@@ -188,15 +188,20 @@
// 鎵ц create 鍛戒护
if createCmd.Parsed() {
+
// 閰嶇疆 Kubernetes 闆嗙兢鐨� kubeconfig 璺緞
kubeconfig := flag.String("kubeconfig", filepath.Join(util.HomeDir(), ".kube", "config"), "kubeconfig file")
flag.Parse()
+
+ fmt.Println(&kubeconfig)
// 鍒涘缓 Kubernetes 瀹㈡埛绔�
config, err := clientcmd.BuildConfigFromFlags("", *kubeconfig)
if err != nil {
panic(err.Error())
}
+
+ fmt.Println(&config)
clientset, err := kubernetes.NewForConfig(config)
if err != nil {
@@ -209,7 +214,12 @@
os.Exit(1)
}
- err = k8s.CreateDeploymentAndService(clientset, *createNamespace, *createDeployment, *createService)
+ err = k8s.CreateDeploymentAndService(k8s.Config{
+ Client: clientset,
+ NameSpace: *createNamespace,
+ DeploymentName: *createDeployment,
+ ServiceName: *createService,
+ }, nil)
if err != nil {
panic(err)
}
@@ -277,7 +287,12 @@
for _, ns := range namespaces {
deploymentName := ns
serviceName := ns
- err := k8s.CreateDeploymentAndService(clientset, ns, deploymentName, serviceName)
+ err := k8s.CreateDeploymentAndService(k8s.Config{
+ Client: clientset,
+ NameSpace: ns,
+ DeploymentName: deploymentName,
+ ServiceName: serviceName,
+ }, nil)
if err != nil {
log.Printf("\033[97;41mFailed to create resources in namespace %s: %v\033[0m\n", ns, err)
} else {
--
Gitblit v1.8.0