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

FIX: [k8scluster] update k8scluster infor from CB-SP for ListK8sCluster() #1938

Merged
merged 2 commits into from
Nov 21, 2024
Merged

FIX: [k8scluster] update k8scluster infor from CB-SP for ListK8sCluster() #1938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9719e45
FIX: [k8scluster] API path
Nov 20, 2024
9154727
FIX: [k8scluster] update k8scluster info from CB-SP
Nov 20, 2024
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
2 changes: 1 addition & 1 deletion src/api/rest/server/resource/k8scluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func RestDeleteK8sNodeGroup(c echo.Context) error {
// @Success 200 {object} model.TbSetK8sNodeGroupAutoscalingRes
// @Failure 404 {object} model.SimpleMsg
// @Failure 500 {object} model.SimpleMsg
// @Router /ns/{nsId}/k8sCluster/{k8sClusterId}/k8sNodeGroup/{k8sNodeGroupName}/onAutoScaling [put]
// @Router /ns/{nsId}/k8sCluster/{k8sClusterId}/k8sNodeGroup/{k8sNodeGroupName}/onAutoscaling [put]
func RestPutSetK8sNodeGroupAutoscaling(c echo.Context) error {

nsId := c.Param("nsId")
Expand Down
32 changes: 16 additions & 16 deletions src/api/rest/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,24 +386,24 @@ func RunServer() {
e.GET("/tumblebug/checkK8sNodeGroupsOnK8sCreation", rest_resource.RestCheckK8sNodeGroupsOnK8sCreation)
e.GET("/tumblebug/checkK8sNodeImageDesignation", rest_resource.RestCheckK8sNodeImageDesignation)
e.GET("/tumblebug/requiredK8sSubnetCount", rest_resource.RestGetRequiredK8sSubnetCount)
g.POST("/:nsId/k8scluster", rest_resource.RestPostK8sCluster)
g.POST("/:nsId/k8scluster/:k8sClusterId/k8snodegroup", rest_resource.RestPostK8sNodeGroup)
g.DELETE("/:nsId/k8scluster/:k8sClusterId/k8snodegroup/:k8sNodeGroupName", rest_resource.RestDeleteK8sNodeGroup)
g.PUT("/:nsId/k8scluster/:k8sClusterId/k8snodegroup/:k8sNodeGroupName/onautoscaling", rest_resource.RestPutSetK8sNodeGroupAutoscaling)
g.PUT("/:nsId/k8scluster/:k8sClusterId/k8snodegroup/:k8sNodeGroupName/autoscalesize", rest_resource.RestPutChangeK8sNodeGroupAutoscaleSize)
g.GET("/:nsId/k8scluster/:k8sClusterId", rest_resource.RestGetK8sCluster, middleware.TimeoutWithConfig(timeoutConfig),
g.POST("/:nsId/k8sCluster", rest_resource.RestPostK8sCluster)
g.POST("/:nsId/k8sCluster/:k8sClusterId/k8sNodeGroup", rest_resource.RestPostK8sNodeGroup)
g.DELETE("/:nsId/k8sCluster/:k8sClusterId/k8sNodeGroup/:k8sNodeGroupName", rest_resource.RestDeleteK8sNodeGroup)
g.PUT("/:nsId/k8sCluster/:k8sClusterId/k8sNodeGroup/:k8sNodeGroupName/onAutoscaling", rest_resource.RestPutSetK8sNodeGroupAutoscaling)
g.PUT("/:nsId/k8sCluster/:k8sClusterId/k8sNodeGroup/:k8sNodeGroupName/autoscaleSize", rest_resource.RestPutChangeK8sNodeGroupAutoscaleSize)
g.GET("/:nsId/k8sCluster/:k8sClusterId", rest_resource.RestGetK8sCluster, middleware.TimeoutWithConfig(timeoutConfig),
middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(2)))
g.GET("/:nsId/k8scluster", rest_resource.RestGetAllK8sCluster, middleware.TimeoutWithConfig(timeoutConfig),
g.GET("/:nsId/k8sCluster", rest_resource.RestGetAllK8sCluster, middleware.TimeoutWithConfig(timeoutConfig),
middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(2)))
g.DELETE("/:nsId/k8scluster/:k8sClusterId", rest_resource.RestDeleteK8sCluster)
g.DELETE("/:nsId/k8scluster", rest_resource.RestDeleteAllK8sCluster)
g.PUT("/:nsId/k8scluster/:k8sClusterId/upgrade", rest_resource.RestPutUpgradeK8sCluster)

e.POST("/tumblebug/k8sclusterRecommendNode", rest_resource.RestRecommendK8sNode)
e.POST("/tumblebug/k8sclusterDynamicCheckRequest", rest_resource.RestPostK8sClusterDynamicCheckRequest)
g.POST("/:nsId/k8sclusterDynamic", rest_resource.RestPostK8sClusterDynamic)
g.POST("/:nsId/k8scluster/:k8sClusterId/k8snodegroupDynamic", rest_resource.RestPostK8sNodeGroupDynamic)
g.GET("/:nsId/control/k8scluster/:k8sClusterId", rest_resource.RestGetControlK8sCluster)
g.DELETE("/:nsId/k8sCluster/:k8sClusterId", rest_resource.RestDeleteK8sCluster)
g.DELETE("/:nsId/k8sCluster", rest_resource.RestDeleteAllK8sCluster)
g.PUT("/:nsId/k8sCluster/:k8sClusterId/upgrade", rest_resource.RestPutUpgradeK8sCluster)

e.POST("/tumblebug/k8sClusterRecommendNode", rest_resource.RestRecommendK8sNode)
e.POST("/tumblebug/k8sClusterDynamicCheckRequest", rest_resource.RestPostK8sClusterDynamicCheckRequest)
g.POST("/:nsId/k8sClusterDynamic", rest_resource.RestPostK8sClusterDynamic)
g.POST("/:nsId/k8sCluster/:k8sClusterId/k8sNodeGroupDynamic", rest_resource.RestPostK8sNodeGroupDynamic)
g.GET("/:nsId/control/k8sCluster/:k8sClusterId", rest_resource.RestGetControlK8sCluster)

// Network Load Balancer
g.POST("/:nsId/mci/:mciId/mcSwNlb", rest_infra.RestPostMcNLB)
Expand Down
6 changes: 3 additions & 3 deletions src/core/model/k8scluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ type TbK8sClusterInfo struct {
// ResourceType is the type of the resource
ResourceType string `json:"resourceType"`

// Id is unique identifier for the object
Id string `json:"id" example:"aws-ap-southeast-1"`
// Id is unique identifier for the object, same as Name
Id string `json:"id" example:"k8scluster-01"`
// Uid is universally unique identifier for the object, used for labelSelector
Uid string `json:"uid,omitempty" example:"wef12awefadf1221edcf"`
// CspResourceName is name assigned to the CSP resource. This name is internally used to handle the resource.
Expand All @@ -314,7 +314,7 @@ type TbK8sClusterInfo struct {
CspResourceId string `json:"cspResourceId,omitempty" example:"csp-06eb41e14121c550a"`

// Name is human-readable string to represent the object
Name string `json:"name" example:"aws-ap-southeast-1"`
Name string `json:"name" example:"k8scluster-01"`
ConnectionName string `json:"connectionName" example:"alibaba-ap-northeast-2"`

// ConnectionConfig shows connection info to cloud service provider
Expand Down
13 changes: 10 additions & 3 deletions src/core/resource/k8scluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,8 +1081,8 @@ func ListK8sCluster(nsId string, filterKey string, filterVal string) (interface{

if kv != nil {
for _, v := range kv {
tbK8sCInfo := model.TbK8sClusterInfo{}
err = json.Unmarshal([]byte(v.Value), &tbK8sCInfo)
storedTbK8sCInfo := model.TbK8sClusterInfo{}
err = json.Unmarshal([]byte(v.Value), &storedTbK8sCInfo)
if err != nil {
log.Err(err).Msg("Failed to List K8sCluster")
return nil, err
Expand All @@ -1096,7 +1096,14 @@ func ListK8sCluster(nsId string, filterKey string, filterVal string) (interface{
continue
}
}
tbK8sCInfoList = append(tbK8sCInfoList, tbK8sCInfo)

tbK8sCInfo, err := GetK8sCluster(nsId, storedTbK8sCInfo.Id)
if err != nil {
log.Err(err).Msg("Failed to List K8sCluster")
continue
}

tbK8sCInfoList = append(tbK8sCInfoList, *tbK8sCInfo)
}
}

Expand Down