Add cloudnative components API supported (caoyingjunz#448)

api/server/router/plan/plan_routes.go

@@ -180,18 +180,21 @@ func (t *planRouter) stopPlan(c *gin.Context) {
 }
 
 type DistributionsMeta struct {
-	Centos []string `json:"centos,omitempty"`
-	Debian []string `json:"debian,omitempty"`
-	Ubuntu []string `json:"ubuntu,omitempty"`
+	Centos    []string `json:"centos,omitempty"`
+	Ubuntu    []string `json:"ubuntu,omitempty"`
+	Debian    []string `json:"debian,omitempty"`
+	OpenEuler []string `json:"openEuler,omitempty"`
+	Rocky     []string `json:"rocky,omitempty"`
 }
 
 func (t *planRouter) getDistributions(c *gin.Context) {
 	r := httputils.NewResponse()
-
 	r.Result = &DistributionsMeta{
-		Centos: []string{"centos7"},
-		Ubuntu: []string{"ubuntu18.04", "ubuntu20.04", "ubuntu22.04", "ubuntu24.04"},
-		Debian: []string{"debian10", "debian11"},
+		Centos:    []string{"centos7"},
+		Ubuntu:    []string{"ubuntu18.04", "ubuntu20.04", "ubuntu22.04", "ubuntu24.04"},
+		Debian:    []string{"debian10", "debian11"},
+		OpenEuler: []string{"openEuler22.03"},
+		Rocky:     []string{"rocky8.5", "rocky9.2", "rocky9.3"},
 	}
 
 	httputils.SetSuccess(c, r)

config.yaml

@@ -31,3 +31,7 @@ worker:
         - debian11
         - ubuntu20.04
         - ubuntu22.04
+        - rocky8.5
+        - rocky9.2
+        - rocky9.3
+        - openEuler22.03

pkg/controller/plan/plan.go

@@ -86,6 +86,7 @@ type plan struct {
 // 1. 创建部署计划
 // 2. 创建部署配置
 // 3. 创建节点列表
+// 3. 创建扩展组件
 func (p *plan) Create(ctx context.Context, req *types.CreatePlanRequest) error {
 	object, err := p.factory.Plan().Create(ctx, &model.Plan{
 		Name:        req.Name,

pkg/controller/plan/plan_config.go

@@ -147,13 +147,18 @@ func (p *plan) buildPlanConfig(ctx context.Context, req *types.CreatePlanConfigR
 	if err != nil {
 		return nil, err
 	}
+	componentConfig, err := req.Component.Marshal()
+	if err != nil {
+		return nil, err
+	}
 
 	return &model.Config{
 		Region:     req.Region,
 		OSImage:    req.OSImage,
 		Kubernetes: kubeConfig,
 		Network:    networkConfig,
 		Runtime:    runtimeConfig,
+		Component:  componentConfig,
 	}, nil
 }
 
@@ -170,6 +175,10 @@ func (p *plan) modelConfig2Type(o *model.Config) (*types.PlanConfig, error) {
 	if err := rs.Unmarshal(o.Runtime); err != nil {
 		return nil, err
 	}
+	cs := &types.ComponentSpec{}
+	if err := cs.Unmarshal(o.Component); err != nil {
+		return nil, err
+	}
 
 	return &types.PlanConfig{
 		PixiuMeta: types.PixiuMeta{
@@ -186,5 +195,6 @@ func (p *plan) modelConfig2Type(o *model.Config) (*types.PlanConfig, error) {
 		Kubernetes: *ks,
 		Network:    *ns,
 		Runtime:    *rs,
+		Component:  *cs,
 	}, nil
 }

pkg/controller/plan/plan_node.go

@@ -18,6 +18,7 @@ package plan
 
 import (
 	"context"
+	"strings"
 
 	"k8s.io/klog/v2"
 
@@ -115,10 +116,11 @@ func (p *plan) buildNodeFromRequest(planId int64, req *types.CreatePlanNodeReque
 	if err != nil {
 		return nil, err
 	}
+
 	return &model.Node{
 		Name:   req.Name,
 		PlanId: planId,
-		Role:   req.Role,
+		Role:   strings.Join(req.Role, ","),
 		CRI:    req.CRI,
 		Ip:     req.Ip,
 		Auth:   auth,
@@ -220,7 +222,7 @@ func (p *plan) modelNode2Type(o *model.Node) (*types.PlanNode, error) {
 		},
 		PlanId: o.PlanId,
 		Name:   o.Name,
-		Role:   o.Role,
+		Role:   strings.Split(o.Role, ","),
 		Ip:     o.Ip,
 		Auth:   auth,
 	}, nil

pkg/controller/plan/render.go

@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"fmt"
 	"path/filepath"
+	"strings"
 	"text/template"
 
 	"github.com/caoyingjunz/pixiu/pkg/db/model"
@@ -118,21 +119,25 @@ func ParseMultinode(data TaskData, workDir string) (Multinode, error) {
 		nodeAuth.Key.File = rsa
 		planNode := types.PlanNode{Name: node.Name, Auth: nodeAuth}
 
+		roles := strings.Split(node.Role, ",")
 		if runtime.IsDocker() {
-			if node.Role == model.MasterRole {
-				multinode.DockerMaster = append(multinode.DockerMaster, planNode)
-			}
-			if node.Role == model.NodeRole {
-				multinode.DockerNode = append(multinode.DockerNode, planNode)
+			for _, role := range roles {
+				if role == model.MasterRole {
+					multinode.DockerMaster = append(multinode.DockerMaster, planNode)
+				}
+				if role == model.NodeRole {
+					multinode.DockerNode = append(multinode.DockerNode, planNode)
+				}
 			}
 		}
-
 		if runtime.IsContainerd() {
-			if node.Role == model.MasterRole {
-				multinode.ContainerdMaster = append(multinode.ContainerdMaster, planNode)
-			}
-			if node.Role == model.NodeRole {
-				multinode.ContainerdNode = append(multinode.ContainerdNode, planNode)
+			for _, role := range roles {
+				if role == model.MasterRole {
+					multinode.ContainerdMaster = append(multinode.ContainerdMaster, planNode)
+				}
+				if role == model.NodeRole {
+					multinode.ContainerdNode = append(multinode.ContainerdNode, planNode)
+				}
 			}
 		}
 	}

pkg/db/model/plan.go

@@ -35,11 +35,11 @@ func (plan *Plan) TableName() string {
 	return "plans"
 }
 
-type KubeRole int
+type KubeRole string
 
 const (
-	NodeRole   KubeRole = iota // kubernetes node role
-	MasterRole                 // kubernetes master role
+	MasterRole string = "master" // kubernetes master role
+	NodeRole   string = "node"   // kubernetes node role
 )
 
 type CRI string
@@ -52,12 +52,12 @@ const (
 type Node struct {
 	pixiu.Model
 
-	Name   string   `json:"name"` // 主机名，相同plan内不允许重复
-	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"`
+	Name   string `json:"name"` // 主机名，相同plan内不允许重复
+	PlanId int64  `json:"plan_id"`
+	Role   string `json:"role"` // k8s 节点的角色，master 和 node
+	CRI    CRI    `json:"cri"`
+	Ip     string `json:"ip"`
+	Auth   string `json:"auth"`
 }
 
 func (node *Node) TableName() string {
@@ -73,6 +73,7 @@ type Config struct {
 	Kubernetes string `json:"kubernetes"`
 	Network    string `json:"network"`
 	Runtime    string `json:"runtime"`
+	Component  string `json:"component"`
 }
 
 func (config *Config) TableName() string {

pkg/types/meta.go

@@ -220,6 +220,21 @@ func (rs *RuntimeSpec) Unmarshal(s string) error {
 	return nil
 }
 
+func (cs ComponentSpec) Marshal() (string, error) {
+	data, err := json.Marshal(cs)
+	if err != nil {
+		return "", err
+	}
+	return string(data), nil
+}
+
+func (cs *ComponentSpec) Unmarshal(s string) error {
+	if err := json.Unmarshal([]byte(s), cs); err != nil {
+		return err
+	}
+	return nil
+}
+
 func (rs *RuntimeSpec) IsDocker() bool {
 	return rs.Runtime == string(model.DockerCRI)
 }

pkg/types/request.go

@@ -100,22 +100,22 @@ type (
 	}
 
 	CreatePlanNodeRequest struct {
-		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"`
+		Name   string       `json:"name" binding:"omitempty"` // required
+		PlanId int64        `json:"plan_id"`
+		Role   []string     `json:"role"` // k8s 节点的角色，master 和 node
+		CRI    model.CRI    `json:"cri"`
+		Ip     string       `json:"ip"`
+		Auth   PlanNodeAuth `json:"auth"`
 	}
 
 	UpdatePlanNodeRequest struct {
-		ResourceVersion int64          `json:"resource_version" binding:"required"` // required
-		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"`
+		ResourceVersion int64        `json:"resource_version" binding:"required"` // required
+		Name            string       `json:"name" binding:"omitempty"`            // required
+		PlanId          int64        `json:"plan_id"`
+		Role            []string     `json:"role"` // k8s 节点的角色，master 为 1 和 node 为 0
+		CRI             model.CRI    `json:"cri"`
+		Ip              string       `json:"ip"`
+		Auth            PlanNodeAuth `json:"auth"`
 	}
 
 	CreatePlanConfigRequest struct {
@@ -127,6 +127,7 @@ type (
 		Kubernetes KubernetesSpec `json:"kubernetes"`
 		Network    NetworkSpec    `json:"network"`
 		Runtime    RuntimeSpec    `json:"runtime"`
+		Component  ComponentSpec  `json:"component"` // 支持的扩展组件配置
 	}
 
 	UpdatePlanConfigRequest struct {

pkg/types/types.go

@@ -119,12 +119,12 @@ type PlanNode struct {
 	PixiuMeta `json:",inline"`
 	TimeMeta  `json:",inline"`
 
-	Name   string         `json:"name"` // required
-	PlanId int64          `json:"plan_id,omitempty"`
-	Role   model.KubeRole `json:"role"` // k8s 节点的角色，master 为 1 和 node 为 0
-	CRI    model.CRI      `json:"cri"`
-	Ip     string         `json:"ip"`
-	Auth   PlanNodeAuth   `json:"auth,omitempty"`
+	Name   string       `json:"name"` // required
+	PlanId int64        `json:"plan_id,omitempty"`
+	Role   []string     `json:"role"` // k8s 节点的角色，master 和 node
+	CRI    model.CRI    `json:"cri"`
+	Ip     string       `json:"ip"`
+	Auth   PlanNodeAuth `json:"auth,omitempty"`
 }
 
 type AuthType string
@@ -171,6 +171,8 @@ type PlanConfig struct {
 	Kubernetes KubernetesSpec `json:"kubernetes"`
 	Network    NetworkSpec    `json:"network"`
 	Runtime    RuntimeSpec    `json:"runtime"`
+	Component  ComponentSpec  `json:"component"` // 支持的扩展组件配置
+
 }
 
 // TimeSpec 通用时间规格
@@ -242,3 +244,24 @@ type NetworkSpec struct {
 type RuntimeSpec struct {
 	Runtime string `json:"runtime"`
 }
+
+type ComponentSpec struct {
+	Helm       *Helm       `json:"helm,omitempty"` // 忽略，则使用默认值
+	Prometheus *Prometheus `json:"prometheus,omitempty"`
+	Grafana    *Grafana    `json:"grafana,omitempty"`
+}
+
+type Helm struct {
+	EnableHelm  string `json:"enable_helm"`
+	HelmRelease string `json:"helm_release"`
+}
+
+type Prometheus struct {
+	EnablePrometheus string `json:"enable_prometheus"`
+}
+
+type Grafana struct {
+	EnableGrafana        string `json:"enable_prometheus"`
+	GrafanaAdminUser     string `json:"grafana_admin_user"`
+	GrafanaAdminPassword string `json:"grafana_admin_password"`
+}