Completed multinode render Func (#413)

caoyingjunz · Jun 8, 2024 · c39f601 · c39f601
1 parent 2c611b3
commit c39f601
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 19 deletions.
diff --git a/pkg/controller/plan/plan_node.go b/pkg/controller/plan/plan_node.go
@@ -52,6 +52,7 @@ func (p *plan) CreateNode(ctx context.Context, pid int64, req *types.CreatePlanN
 		Name:   req.Name,
 		PlanId: pid,
 		Role:   req.Role,
+		CRI:    req.CRI,
 		Ip:     req.Ip,
 		Auth:   auth,
 	}); err != nil {

diff --git a/pkg/controller/plan/render.go b/pkg/controller/plan/render.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/caoyingjunz/pixiu/pkg/db/model"
+	"github.com/caoyingjunz/pixiu/pkg/types"
 	"github.com/caoyingjunz/pixiu/pkg/util"
 	pixiutpl "github.com/caoyingjunz/pixiu/template"
 )
@@ -49,7 +50,11 @@ func (r Render) Run() error {
 		return err
 	}
 	// 渲染 multiNode
-	if err := r.doRender("multinode", pixiutpl.MultiModeTemplate, ParseMultinode(r.data)); err != nil {
+	multiNode, err := ParseMultinode(r.data)
+	if err != nil {
+		return err
+	}
+	if err := r.doRender("multinode", pixiutpl.MultiModeTemplate, multiNode); err != nil {
 		return err
 	}
 	// 渲染 globals
@@ -98,29 +103,49 @@ func getFileForRender(planId int64, f string) (string, error) {
 }
 
 type Multinode struct {
-	DockerMaster     []string
-	DockerNode       []string
-	ContainerdMaster []string
-	ContainerdNode   []string
+	DockerMaster     []types.PlanNode
+	DockerNode       []types.PlanNode
+	ContainerdMaster []types.PlanNode
+	ContainerdNode   []types.PlanNode
 }
 
-func ParseMultinode(data TaskData) Multinode {
+func ParseMultinode(data TaskData) (Multinode, error) {
 	multinode := Multinode{
-		DockerMaster:     make([]string, 0),
-		DockerNode:       make([]string, 0),
-		ContainerdMaster: make([]string, 0),
-		ContainerdNode:   make([]string, 0),
+		DockerMaster:     make([]types.PlanNode, 0),
+		DockerNode:       make([]types.PlanNode, 0),
+		ContainerdMaster: make([]types.PlanNode, 0),
+		ContainerdNode:   make([]types.PlanNode, 0),
 	}
 	for _, node := range data.Nodes {
-		if node.Role == model.MasterRole {
-			multinode.DockerMaster = append(multinode.DockerMaster, node.Name)
+		nodeAuth := types.PlanNodeAuth{}
+		err := nodeAuth.Unmarshal(node.Auth)
+		if err != nil {
+			return multinode, err
+		}
+		planNode := types.PlanNode{
+			Name: node.Name,
+			Auth: nodeAuth,
+		}
+
+		if node.CRI == model.DockerCRI {
+			if node.Role == model.MasterRole {
+				multinode.DockerMaster = append(multinode.DockerMaster, planNode)
+			}
+			if node.Role == model.NodeRole {
+				multinode.DockerNode = append(multinode.DockerNode, planNode)
+			}
 		}
-		if node.Role == model.NodeRole {
-			multinode.DockerNode = append(multinode.DockerNode, node.Name)
+		if node.CRI == model.ContainerdCRI {
+			if node.Role == model.MasterRole {
+				multinode.ContainerdMaster = append(multinode.ContainerdMaster, planNode)
+			}
+			if node.Role == model.NodeRole {
+				multinode.ContainerdNode = append(multinode.ContainerdNode, planNode)
+			}
 		}
 	}
 
-	return multinode
+	return multinode, nil
 }
 
 type Global struct {

diff --git a/pkg/db/model/plan.go b/pkg/db/model/plan.go
@@ -42,12 +42,20 @@ const (
 	MasterRole                 // kubernetes master role
 )
 
+type CRI string
+
+const (
+	DockerCRI     CRI = "docker"
+	ContainerdCRI CRI = "containerd"
+)
+
 type Node struct {
 	pixiu.Model
 
 	Name   string   `gorm:"index:idx_name,unique" json:"name"`
 	PlanId int64    `json:"plan_id"`
 	Role   KubeRole `json:"role"` // k8s 节点的角色，master 为 1 和 node 为 0
+	CRI    CRI      `json:"cri"`
 	Ip     string   `json:"ip"`
 	Auth   string   `json:"auth"`
 }

diff --git a/pkg/types/request.go b/pkg/types/request.go
@@ -95,6 +95,7 @@ type (
 		Name   string         `json:"name" binding:"omitempty"` // required
 		PlanId int64          `json:"plan_id"`
 		Role   model.KubeRole `json:"role"` // k8s 节点的角色，master 为 1 和 node 为 0
+		CRI    model.CRI      `json:"cri"`
 		Ip     string         `json:"ip"`
 		Auth   PlanNodeAuth   `json:"auth"`
 	}
@@ -104,6 +105,7 @@ type (
 		Name            string         `json:"name" binding:"omitempty"`            // required
 		PlanId          int64          `json:"plan_id"`
 		Role            model.KubeRole `json:"role"` // k8s 节点的角色，master 为 1 和 node 为 0
+		CRI             model.CRI      `json:"cri"`
 		Ip              string         `json:"ip"`
 		Auth            PlanNodeAuth   `json:"auth"`
 	}

diff --git a/pkg/types/types.go b/pkg/types/types.go
@@ -119,6 +119,7 @@ type PlanNode struct {
 	Name   string         `json:"name"` // required
 	PlanId int64          `json:"plan_id"`
 	Role   model.KubeRole `json:"role"` // k8s 节点的角色，master 为 1 和 node 为 0
+	CRI    model.CRI      `json:"cri"`
 	Ip     string         `json:"ip"`
 	Auth   PlanNodeAuth   `json:"auth,omitempty"`
 }

diff --git a/template/multinode.go b/template/multinode.go
@@ -19,22 +19,30 @@ package template
 const MultiModeTemplate = `# Render below by Pixiu engine
 [docker-master]
 {{- range .DockerMaster }}
-{{ . }}
+{{- if eq .Auth.Type "password" }}
+{{ .Name }} ansible_ssh_user={{ .Auth.Password.User }} ansible_ssh_pass={{ .Auth.Password.Password }}
+{{- end }}
 {{- end }}
 
 [docker-node]
 {{- range .DockerNode }}
-{{ . }}
+{{- if eq .Auth.Type "password" }}
+{{ .Name }} ansible_ssh_user={{ .Auth.Password.User }} ansible_ssh_pass={{ .Auth.Password.Password }}
+{{- end }}
 {{- end }}
 
 [containerd-master]
 {{- range .ContainerdMaster }}
-{{ . }}
+{{- if eq .Auth.Type "password" }}
+{{ .Name }} ansible_ssh_user={{ .Auth.Password.User }} ansible_ssh_pass={{ .Auth.Password.Password }}
+{{- end }}
 {{- end }}
 
 [containerd-node]
 {{- range .ContainerdNode }}
-{{ . }}
+{{- if eq .Auth.Type "password" }}
+{{ .Name }} ansible_ssh_user={{ .Auth.Password.User }} ansible_ssh_pass={{ .Auth.Password.Password }}
+{{- end }}
 {{- end }}
 
 [storage]