可以在集群中查看待安装节点、并直接安装节点

internal/web/actions/default/clusters/cluster/createBatch.go

@@ -0,0 +1,98 @@
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/maps"
+	"net"
+	"strconv"
+	"strings"
+)
+
+type CreateBatchAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreateBatchAction) Init() {
+	this.Nav("", "node", "create")
+	this.SecondMenu("nodes")
+}
+
+func (this *CreateBatchAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	leftMenuItems := []maps.Map{
+		{
+			"name":     "单个创建",
+			"url":      "/clusters/cluster/createNode?clusterId=" + strconv.FormatInt(params.ClusterId, 10),
+			"isActive": false,
+		},
+		{
+			"name":     "批量创建",
+			"url":      "/clusters/cluster/createBatch?clusterId=" + strconv.FormatInt(params.ClusterId, 10),
+			"isActive": true,
+		},
+	}
+	this.Data["leftMenuItems"] = leftMenuItems
+
+	this.Show()
+}
+
+func (this *CreateBatchAction) RunPost(params struct {
+	ClusterId int64
+	IpList    string
+
+	Must *actions.Must
+}) {
+	if params.ClusterId <= 0 {
+		this.Fail("请选择正确的集群")
+	}
+
+	// 校验
+	// TODO 支持IP范围，比如：192.168.1.[100-105]
+	realIPList := []string{}
+	for _, ip := range strings.Split(params.IpList, "\n") {
+		ip = strings.TrimSpace(ip)
+		if len(ip) == 0 {
+			continue
+		}
+		ip = strings.ReplaceAll(ip, " ", "")
+
+		if net.ParseIP(ip) == nil {
+			this.Fail("发现错误的IP地址：" + ip)
+		}
+
+		if lists.ContainsString(realIPList, ip) {
+			continue
+		}
+		realIPList = append(realIPList, ip)
+	}
+
+	// 保存
+	for _, ip := range realIPList {
+		resp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
+			Name:      ip,
+			ClusterId: params.ClusterId,
+			Login:     nil,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		nodeId := resp.NodeId
+		_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
+			NodeId:    nodeId,
+			Name:      "IP地址",
+			Ip:        ip,
+			CanAccess: true,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/createNode.go

@@ -0,0 +1,120 @@
+package cluster
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+	"strconv"
+)
+
+// 创建节点
+type CreateNodeAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreateNodeAction) Init() {
+	this.Nav("", "node", "create")
+	this.SecondMenu("nodes")
+}
+
+func (this *CreateNodeAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	leftMenuItems := []maps.Map{
+		{
+			"name":     "单个创建",
+			"url":      "/clusters/cluster/createNode?clusterId=" + strconv.FormatInt(params.ClusterId, 10),
+			"isActive": true,
+		},
+		{
+			"name":     "批量创建",
+			"url":      "/clusters/cluster/createBatch?clusterId=" + strconv.FormatInt(params.ClusterId, 10),
+			"isActive": false,
+		},
+	}
+	this.Data["leftMenuItems"] = leftMenuItems
+
+	this.Show()
+}
+
+func (this *CreateNodeAction) RunPost(params struct {
+	Name            string
+	IpAddressesJSON []byte
+	ClusterId       int64
+	GrantId         int64
+	SshHost         string
+	SshPort         int
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入节点名称")
+
+	if len(params.IpAddressesJSON) == 0 {
+		this.Fail("请至少添加一个IP地址")
+	}
+
+	// TODO 检查cluster
+	if params.ClusterId <= 0 {
+		this.Fail("请选择所在集群")
+	}
+
+	// TODO 检查登录授权
+	loginInfo := &pb.NodeLogin{
+		Id:   0,
+		Name: "SSH",
+		Type: "ssh",
+		Params: maps.Map{
+			"grantId": params.GrantId,
+			"host":    params.SshHost,
+			"port":    params.SshPort,
+		}.AsJSON(),
+	}
+
+	// 保存
+	createResp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
+		Name:      params.Name,
+		ClusterId: params.ClusterId,
+		Login:     loginInfo,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	nodeId := createResp.NodeId
+
+	// IP地址
+	ipAddresses := []maps.Map{}
+	if len(params.IpAddressesJSON) > 0 {
+		err = json.Unmarshal(params.IpAddressesJSON, &ipAddresses)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		for _, address := range ipAddresses {
+			addressId := address.GetInt64("id")
+			if addressId > 0 {
+				_, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{
+					AddressId: addressId,
+					NodeId:    nodeId,
+				})
+			} else {
+				_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
+					NodeId:    nodeId,
+					Name:      address.GetString("name"),
+					Ip:        address.GetString("ip"),
+					CanAccess: address.GetBool("canAccess"),
+				})
+			}
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/init.go

@@ -15,11 +15,15 @@ func init() {
 			Prefix("/clusters/cluster").
 			Get("", new(IndexAction)).
 			GetPost("/installNodes", new(InstallNodesAction)).
+			GetPost("/installRemote", new(InstallRemoteAction)).
+			Post("/installStatus", new(InstallStatusAction)).
 			GetPost("/delete", new(DeleteAction)).
+			GetPost("/createNode", new(CreateNodeAction)).
+			GetPost("/createBatch", new(CreateBatchAction)).
+			GetPost("/updateNodeSSH", new(UpdateNodeSSHAction)).
 
 			// 节点相关
 			Get("/node", new(node.NodeAction)).
-			GetPost("/node/create", new(node.CreateAction)).
 			GetPost("/node/update", new(node.UpdateAction)).
 			GetPost("/node/install", new(node.InstallAction)).
 			Post("/node/updateInstallStatus", new(node.UpdateInstallStatusAction)).

internal/web/actions/default/clusters/cluster/installNodes.go

@@ -1,6 +1,7 @@
 package cluster
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
@@ -19,6 +20,19 @@ func (this *InstallNodesAction) Init() {
 func (this *InstallNodesAction) RunGet(params struct {
 	ClusterId int64
 }) {
+	this.Data["leftMenuItems"] = []maps.Map{
+		{
+			"name":     "自动注册",
+			"url":      "/clusters/cluster/installNodes?clusterId=" + numberutils.FormatInt64(params.ClusterId),
+			"isActive": true,
+		},
+		{
+			"name":     "远程安装",
+			"url":      "/clusters/cluster/installRemote?clusterId=" + numberutils.FormatInt64(params.ClusterId),
+			"isActive": false,
+		},
+	}
+
 	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{ClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/clusters/cluster/installRemote.go

@@ -0,0 +1,94 @@
+package cluster
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type InstallRemoteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *InstallRemoteAction) Init() {
+	this.Nav("", "node", "install")
+	this.SecondMenu("nodes")
+}
+
+func (this *InstallRemoteAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	this.Data["leftMenuItems"] = []maps.Map{
+		{
+			"name":     "自动注册",
+			"url":      "/clusters/cluster/installNodes?clusterId=" + numberutils.FormatInt64(params.ClusterId),
+			"isActive": false,
+		},
+		{
+			"name":     "远程安装",
+			"url":      "/clusters/cluster/installRemote?clusterId=" + numberutils.FormatInt64(params.ClusterId),
+			"isActive": true,
+		},
+	}
+
+	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{ClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	nodeMaps := []maps.Map{}
+	for _, node := range nodesResp.Nodes {
+		loginParams := maps.Map{}
+		if node.Login != nil && len(node.Login.Params) > 0 {
+			err := json.Unmarshal(node.Login.Params, &loginParams)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
+
+		installStatus := maps.Map{
+			"isRunning":  false,
+			"isFinished": false,
+		}
+		if node.InstallStatus != nil {
+			installStatus = maps.Map{
+				"isRunning":  node.InstallStatus.IsRunning,
+				"isFinished": node.InstallStatus.IsFinished,
+				"isOk":       node.InstallStatus.IsOk,
+				"error":      node.InstallStatus.Error,
+			}
+		}
+
+		nodeMaps = append(nodeMaps, maps.Map{
+			"id":            node.Id,
+			"isOn":          node.IsOn,
+			"name":          node.Name,
+			"addresses":     node.IpAddresses,
+			"login":         node.Login,
+			"loginParams":   loginParams,
+			"installStatus": installStatus,
+		})
+	}
+	this.Data["nodes"] = nodeMaps
+
+	this.Show()
+}
+
+func (this *InstallRemoteAction) RunPost(params struct {
+	NodeId int64
+
+	Must *actions.Must
+}) {
+	_, err := this.RPC().NodeRPC().InstallNode(this.AdminContext(), &pb.InstallNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/installStatus.go

@@ -0,0 +1,35 @@
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type InstallStatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *InstallStatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	resp, err := this.RPC().NodeRPC().FindNodeInstallStatus(this.AdminContext(), &pb.FindNodeInstallStatusRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if resp.InstallStatus == nil {
+		this.Data["status"] = nil
+		this.Success()
+	}
+
+	this.Data["status"] = maps.Map{
+		"isRunning":  resp.InstallStatus.IsRunning,
+		"isFinished": resp.InstallStatus.IsFinished,
+		"isOk":       resp.InstallStatus.IsOk,
+		"error":      resp.InstallStatus.Error,
+		"errorCode":  resp.InstallStatus.ErrorCode,
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/create.go

@@ -1,88 +0,0 @@
-package node
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/maps"
-)
-
-// 创建节点
-type CreateAction struct {
-	actionutils.ParentAction
-}
-
-func (this *CreateAction) Init() {
-	this.Nav("", "node", "create")
-	this.SecondMenu("nodes")
-}
-
-func (this *CreateAction) RunGet(params struct{}) {
-	this.Show()
-}
-
-func (this *CreateAction) RunPost(params struct {
-	Name        string
-	IPAddresses string `alias:"ipAddresses"`
-	ClusterId   int64
-	GrantId     int64
-	SshHost     string
-	SshPort     int
-
-	Must *actions.Must
-}) {
-	params.Must.
-		Field("name", params.Name).
-		Require("请输入节点名称")
-
-	// TODO 检查cluster
-	if params.ClusterId <= 0 {
-		this.Fail("请选择所在集群")
-	}
-
-	// TODO 检查登录授权
-	loginInfo := &pb.NodeLogin{
-		Id:   0,
-		Name: "SSH",
-		Type: "ssh",
-		Params: maps.Map{
-			"grantId": params.GrantId,
-			"host":    params.SshHost,
-			"port":    params.SshPort,
-		}.AsJSON(),
-	}
-
-	// 保存
-	createResp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
-		Name:      params.Name,
-		ClusterId: params.ClusterId,
-		Login:     loginInfo,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	nodeId := createResp.NodeId
-
-	// IP地址
-	ipAddresses := []maps.Map{}
-	err = json.Unmarshal([]byte(params.IPAddresses), &ipAddresses)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	for _, address := range ipAddresses {
-		addressId := address.GetInt64("id")
-		_, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{
-			AddressId: addressId,
-			NodeId:    nodeId,
-		})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	}
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/node/install.go

@@ -76,6 +76,9 @@ func (this *InstallAction) RunGet(params struct {
 	apiNodes := apiNodesResp.Nodes
 	apiEndpoints := []string{}
 	for _, apiNode := range apiNodes {
+		if !apiNode.IsOn {
+			continue
+		}
 		apiEndpoints = append(apiEndpoints, apiNode.AccessAddrs...)
 	}
 	this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\""

internal/web/actions/default/clusters/cluster/updateNodeSSH.go

@@ -0,0 +1,119 @@
+package cluster
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdateNodeSSHAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateNodeSSHAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdateNodeSSHAction) RunGet(params struct {
+	NodeId int64
+}) {
+	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if nodeResp.Node == nil {
+		this.NotFound("node", params.NodeId)
+		return
+	}
+
+	node := nodeResp.Node
+	this.Data["node"] = maps.Map{
+		"id":   node.Id,
+		"name": node.Name,
+	}
+
+	// SSH
+	loginParams := maps.Map{
+		"host":    "",
+		"port":    "",
+		"grantId": 0,
+	}
+	this.Data["loginId"] = 0
+	if node.Login != nil {
+		this.Data["loginId"] = node.Login.Id
+		if len(node.Login.Params) > 0 {
+			err = json.Unmarshal(node.Login.Params, &loginParams)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
+	}
+	this.Data["params"] = loginParams
+
+	// 认证信息
+	grantId := loginParams.GetInt64("grantId")
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+	if err != nil {
+		this.ErrorPage(err)
+	}
+	var grantMap maps.Map = nil
+	if grantResp.Grant != nil {
+		grantMap = maps.Map{
+			"id":         grantResp.Grant.Id,
+			"name":       grantResp.Grant.Name,
+			"method":     grantResp.Grant.Method,
+			"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+		}
+	}
+	this.Data["grant"] = grantMap
+
+	this.Show()
+}
+
+func (this *UpdateNodeSSHAction) RunPost(params struct {
+	NodeId  int64
+	LoginId int64
+	SshHost string
+	SshPort int
+	GrantId int64
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("sshHost", params.SshHost).
+		Require("请输入SSH主机地址").
+		Field("sshPort", params.SshPort).
+		Gt(0, "SSH主机端口需要大于0").
+		Lt(65535, "SSH主机端口需要小于65535")
+
+	if params.GrantId <= 0 {
+		this.Fail("需要选择或填写至少一个认证信息")
+	}
+
+	login := &pb.NodeLogin{
+		Id:   params.LoginId,
+		Name: "SSH",
+		Type: "ssh",
+		Params: maps.Map{
+			"grantId": params.GrantId,
+			"host":    params.SshHost,
+			"port":    params.SshPort,
+		}.AsJSON(),
+	}
+
+	_, err := this.RPC().NodeRPC().UpdateNodeLogin(this.AdminContext(), &pb.UpdateNodeLoginRequest{
+		NodeId: params.NodeId,
+		Login:  login,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}