Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[k8scluster] add CheckNodeGroupsOnK8sCreation API (no routed) #1712

Merged
merged 1 commit into from
Aug 14, 2024
Merged

[k8scluster] add CheckNodeGroupsOnK8sCreation API (no routed) #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions assets/k8sclusterinfo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# The file is in YAML format and contains the following fields:
# k8scluster: Top level key
# <csp>: Name of the CSP
# nodegroupsWithCluster:
# nodeGroupsOnCreation:
# version:
# - region: [region1, region2, common(special keyword: most of regions)]
#

k8scluster:
azure:
nodegroupsWithCluster: true
nodeGroupsOnCreation: true
nodeImageDesignation: false
version:
- region: [westeurope,westus]
Expand Down Expand Up @@ -41,7 +41,7 @@ k8scluster:
min: 10
max: 40
gcp:
nodegroupsWithCluster: true
nodeGroupsOnCreation: true
nodeImageDesignation: true
version:
- region: [common]
Expand All @@ -61,7 +61,7 @@ k8scluster:
min: 10
max: 40
alibaba:
nodegroupsWithCluster: false
nodeGroupsOnCreation: false
nodeImageDesignation: true
version:
# ServiceUnavailable or NotSupportedSLB
Expand All @@ -84,7 +84,7 @@ k8scluster:
min: 10
max: 40
nhncloud:
nodegroupsWithCluster: true
nodeGroupsOnCreation: true
nodeImageDesignation: true
version:
- region: [kr1, kr2]
Expand All @@ -106,7 +106,7 @@ k8scluster:
min: 10
max: 40
tencent:
nodegroupsWithCluster: false
nodeGroupsOnCreation: false
nodeImageDesignation: true
version:
- region: [common]
Expand Down
24 changes: 24 additions & 0 deletions src/api/rest/server/mcis/k8scluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,30 @@ func RestGetAvailableK8sClusterNodeImage(c echo.Context) error {
return common.EndRequestWithLog(c, reqID, err, content)
}

// RestCheckNodeGroupsOnK8sCreation func is a rest api wrapper for CheckNodeGroupsOnK8sCreation.
// RestCheckNodeGroupsOnK8sCreation godoc
// @ID CheckNodeGroupsOnK8sCreation
// @Summary Check whether nodegroups are required during the k8scluster creation
// @Description Check whether nodegroups are required during the k8scluster creation
// @Tags [Infra resource] K8sCluster management
// @Accept json
// @Produce json
// @Param providerName query string true "Name of the CSP to retrieve"
// @Success 200 {object} bool
// @Failure 404 {object} common.SimpleMsg
// @Failure 500 {object} common.SimpleMsg
// @Router /checkNodeGroupsOnK8sCreation [get]
func RestCheckNodeGroupsOnK8sCreation(c echo.Context) error {
reqID, idErr := common.StartRequestWithLog(c)
if idErr != nil {
return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
}
providerName := c.QueryParam("providerName")

content, err := common.CheckNodeGroupsOnK8sCreation(providerName)
return common.EndRequestWithLog(c, reqID, err, content)
}

// RestPostK8sCluster func is a rest api wrapper for CreateK8sCluster.
// RestPostK8sCluster godoc
// @ID PostK8sCluster
Expand Down
8 changes: 4 additions & 4 deletions src/core/common/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ type K8sClusterInfo struct {

// K8sClusterDetail is structure for kubernetes cluster detail information
type K8sClusterDetail struct {
NodeGroupsWithCluster bool `mapstructure:"nodegroupsWithCluster" json:"nodegroups_with_cluster"`
Version []K8sClusterVersionDetail `mapstructure:"version" json:"versions"`
NodeImage []K8sClusterNodeImageDetail `mapstructure:"nodeImage" json:"node_images"`
RootDisk []K8sClusterRootDiskDetail `mapstructure:"rootDisk" json:"root_disks"`
NodeGroupsOnCreation bool `mapstructure:"nodeGroupsOnCreation" json:"nodegroups_on_creation"`
Version []K8sClusterVersionDetail `mapstructure:"version" json:"versions"`
NodeImage []K8sClusterNodeImageDetail `mapstructure:"nodeImage" json:"node_images"`
RootDisk []K8sClusterRootDiskDetail `mapstructure:"rootDisk" json:"root_disks"`
}

// K8sClusterVersionDetail is structure for kubernetes cluster version detail information
Expand Down
17 changes: 17 additions & 0 deletions src/core/common/utility.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,6 +1329,23 @@ func GetAvailableK8sClusterNodeImage(providerName string, regionName string) (*[
return nil, fmt.Errorf("no available kubernetes cluster node image for region(%s) of provider(%s)", regionName, providerName)
}

// CheckNodeGroupsOnK8sCreation is func to check whether nodegroups are required during the k8scluster creation
func CheckNodeGroupsOnK8sCreation(providerName string) (bool, error) {
//
// Check nodeGroupsOnCreation field in k8sclusterinfo.yaml
//

providerName = strings.ToLower(providerName)

// Get K8sClusterDetail for providerName
k8sClusterDetail := getK8sClusterDetail(providerName)
if k8sClusterDetail == nil {
return false, fmt.Errorf("unsupported provider(%s) for kubernetes cluster", providerName)
}

return k8sClusterDetail.NodeGroupsOnCreation, nil
}

/*
func isValidSpecForK8sCluster(spec *mcir.TbSpecInfo) bool {
//
Expand Down