Skip to content

chore: Fix cluster and environment page #6775

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

Merged
merged 1 commit into from
Aug 5, 2025
Merged

chore: Fix cluster and environment page #6775

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
3 changes: 3 additions & 0 deletions api/cluster/ClusterRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ func (impl ClusterRestHandlerImpl) FindAll(w http.ResponseWriter, r *http.Reques
var result []*bean2.ClusterBean
for _, item := range clusterList {
if ok := impl.enforcer.Enforce(token, casbin.ResourceCluster, casbin.ActionGet, item.ClusterName); ok {
item.SetClusterStatus()
result = append(result, item)
}
}
Expand Down Expand Up @@ -343,8 +344,10 @@ func (impl ClusterRestHandlerImpl) FindByIds(w http.ResponseWriter, r *http.Requ
var result []*bean2.ClusterBean
for _, item := range clusterList {
if ok := impl.enforcer.Enforce(token, casbin.ResourceCluster, casbin.ActionGet, item.ClusterName); ok {
item.SetClusterStatus()
result = append(result, item)
}

}
//RBAC enforcer Ends

Expand Down
1 change: 1 addition & 0 deletions pkg/cluster/ClusterService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ func (impl *ClusterServiceImpl) FindAll() ([]*bean.ClusterBean, error) {
var beans []*bean.ClusterBean
for _, model := range models {
bean := adapter.GetClusterBean(model)
bean.SetClusterStatus()
beans = append(beans, &bean)
}
return beans, nil
Expand Down
21 changes: 21 additions & 0 deletions pkg/cluster/bean/bean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ type ClusterBean struct {
IsVirtualCluster bool `json:"isVirtualCluster"`
ClusterUpdated bool `json:"clusterUpdated"`
IsProd bool `json:"isProd"`
ClusterStatus ClusterStatus `json:"clusterStatus,omitempty"`
}

// TODO: fix duplicate
func (bean *ClusterBean) SetClusterStatus() {
if len(bean.ErrorInConnecting) > 0 {
// if there's an error in connecting, cluster status is connection failed
bean.ClusterStatus = ClusterStatusConnectionFailed
} else {
// if no connection error, cluster status is healthy
bean.ClusterStatus = ClusterStatusHealthy
}
}

func (bean ClusterBean) GetClusterConfig() *k8s.ClusterConfig {
Expand Down Expand Up @@ -90,3 +102,12 @@ const (
DefaultNamespace = "default"
CmFieldUpdatedOn = "updated_on"
)

type ClusterStatus string

// TODO: fix duplicate
const (
ClusterStatusHealthy ClusterStatus = "healthy"
ClusterStatusUnHealthy ClusterStatus = "unhealthy"
ClusterStatusConnectionFailed ClusterStatus = "connection failed"
)