From 064c0874e5fd041c4641ef873d1bf72ac98a184d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 02 六月 2023 16:26:09 +0800
Subject: [PATCH] Merge branch 'master' into fly_develop
---
src/rancher/rancher.go | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/rancher/rancher.go b/src/rancher/rancher.go
index 80b2662..2c32007 100644
--- a/src/rancher/rancher.go
+++ b/src/rancher/rancher.go
@@ -6,7 +6,6 @@
"basic.com/aps/aps_deploy.git/src/util"
)
-
type Node struct {
Roles []string `json:"roles"`
IP string `json:"ip"`
@@ -15,14 +14,12 @@
SSHPort int `json:"sshPort"`
}
-
type RancherClusterConfig struct {
RancherURL string `json:"rancherURL"`
BearerToken string `json:"bearerToken"`
- ClusterName string `mapstructure:"ClusterName"`
- Nodes []Node `mapstructure:"Nodes"`
+ ClusterName string `mapstructure:"ClusterName"`
+ Nodes []Node `mapstructure:"Nodes"`
}
-
func isRancherInstalled(ip, username, password string, sshPort int) (bool, error) {
// 妫�鏌ancher瀹瑰櫒鏄惁宸茶繍琛�
--
Gitblit v1.8.0