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 | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/rancher/rancher.go b/src/rancher/rancher.go
index 5bba2ba..2c32007 100644
--- a/src/rancher/rancher.go
+++ b/src/rancher/rancher.go
@@ -6,9 +6,19 @@
"basic.com/aps/aps_deploy.git/src/util"
)
-type RancherConfig struct {
+type Node struct {
+ Roles []string `json:"roles"`
+ IP string `json:"ip"`
+ SSHUsername string `json:"sshUsername"`
+ SSHPassword string `json:"sshPassword"`
+ SSHPort int `json:"sshPort"`
+}
+
+type RancherClusterConfig struct {
RancherURL string `json:"rancherURL"`
BearerToken string `json:"bearerToken"`
+ ClusterName string `mapstructure:"ClusterName"`
+ Nodes []Node `mapstructure:"Nodes"`
}
func isRancherInstalled(ip, username, password string, sshPort int) (bool, error) {
--
Gitblit v1.8.0