From 632954f9bd2aed21a566d114ed64b5bce4dedb1b Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期三, 24 五月 2023 20:07:56 +0800
Subject: [PATCH] 更新代码，执行main测试
---
src/k8s/create.go | 2 +-
src/main/main.go | 2 +-
src/cluster/cluster.go | 7 ++-----
src/k8s/delete.go | 13 +++++--------
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/cluster/cluster.go b/src/cluster/cluster.go
index bf26f6a..de960b7 100644
--- a/src/cluster/cluster.go
+++ b/src/cluster/cluster.go
@@ -9,6 +9,7 @@
"strings"
"basic.com/aps/aps_deploy.git/src/util"
+ "basic.com/aps/aps_deploy.git/src/rancher"
)
type Cluster struct {
@@ -154,10 +155,6 @@
SSHPort int `json:"sshPort"`
}
-type RancherConfig struct {
- RancherURL string `json:"rancherURL"`
- BearerToken string `json:"bearerToken"`
-}
type ClusterCreateRequest struct {
Name string `json:"name"`
@@ -250,7 +247,7 @@
return true, nil
}
-func CreateCluster(rancherConfig RancherConfig, clusterName string) error {
+func CreateCluster(rancherConfig rancher.RancherConfig, clusterName string) error {
requestBody := createClusterData(clusterName)
url := fmt.Sprintf("%s/v3/clusters", rancherConfig.RancherURL)
diff --git a/src/k8s/create.go b/src/k8s/create.go
index 4865777..3be6767 100644
--- a/src/k8s/create.go
+++ b/src/k8s/create.go
@@ -25,7 +25,7 @@
usedNodePorts = make(map[int32]bool)
)
-func main() {
+func create_test() {
// 閰嶇疆 Kubernetes 闆嗙兢鐨� kubeconfig 璺緞
kubeconfig := flag.String("kubeconfig", filepath.Join(util.HomeDir(), ".kube", "config"), "kubeconfig file")
flag.Parse()
diff --git a/src/k8s/delete.go b/src/k8s/delete.go
index d63af12..018e39d 100644
--- a/src/k8s/delete.go
+++ b/src/k8s/delete.go
@@ -13,14 +13,11 @@
"k8s.io/client-go/tools/clientcmd"
)
-var (
- replicas int32 = 3
- port int32 = 9081
- namespaces = []string{"guangsheng", "geruimi", "tongsheng"}
- usedNodePorts = make(map[int32]bool)
-)
-
-func main() {
+func delete_test() {
+ var (
+ namespaces = []string{"guangsheng", "geruimi", "tongsheng"}
+ )
+
// 閰嶇疆 Kubernetes 闆嗙兢鐨� kubeconfig 璺緞
kubeconfig := flag.String("kubeconfig", filepath.Join(util.HomeDir(), ".kube", "config"), "kubeconfig file")
flag.Parse()
diff --git a/src/main/main.go b/src/main/main.go
index a6f27a7..11f948f 100644
--- a/src/main/main.go
+++ b/src/main/main.go
@@ -256,7 +256,7 @@
if err != nil {
log.Printf("\033[97;41mFailed to create resources in namespace %s: %v\033[0m\n", ns, err)
} else {
- nodeport, err := create.GetServiceNodePort(clientset, ns, ns)
+ nodeport, err := k8s.GetServiceNodePort(clientset, ns, ns)
if err != nil {
panic(err)
}
--
Gitblit v1.8.0