Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 cmd/external-app/wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions pkg/k8s/capacity/bean/bean.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,29 @@ type ClusterCapacityDetail struct {
ServerVersion string `json:"serverVersion,omitempty"`
Cpu *ResourceDetailObject `json:"cpu"`
Memory *ResourceDetailObject `json:"memory"`
Status ClusterStatus `json:"status,omitempty"`
IsVirtualCluster bool `json:"isVirtualCluster"`
IsProd bool `json:"isProd"`
}

func (details *ClusterCapacityDetail) SetStatus(nodeErrors map[corev1.NodeConditionType][]string) {
if len(nodeErrors) > 0 {
// if any node has error then cluster status is unhealthy
details.Status = ClusterStatusUnHealthy
} else {
details.Status = ClusterStatusHealthy
}

}

type ClusterStatus string

const (
ClusterStatusHealthy ClusterStatus = "healthy"
ClusterStatusUnHealthy ClusterStatus = "unhealthy"
ClusterStatusConnectionFailed ClusterStatus = "connection failed"
)

type NodeCapacityDetail struct {
Name string `json:"name"`
Version string `json:"version,omitempty"`
Expand Down
3 changes: 3 additions & 0 deletions pkg/k8s/capacity/k8sCapacityService.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,14 @@ func (impl *K8sCapacityServiceImpl) GetClusterCapacityDetailList(ctx context.Con
var err error
if len(cluster.ErrorInConnecting) > 0 {
clusterCapacityDetail.ErrorInConnection = cluster.ErrorInConnecting
clusterCapacityDetail.Status = bean.ClusterStatusConnectionFailed
} else {
clusterCapacityDetail, err = impl.GetClusterCapacityDetail(ctx, cluster, true)
if err != nil {
impl.logger.Errorw("error in getting cluster capacity details by id", "clusterID", cluster.Id, "err", err)
clusterCapacityDetail = &bean.ClusterCapacityDetail{
ErrorInConnection: err.Error(),
Status: bean.ClusterStatusConnectionFailed,
}
}
}
Expand Down Expand Up @@ -189,6 +191,7 @@ func (impl *K8sCapacityServiceImpl) setBasicClusterDetails(nodeList *corev1.Node
clusterDetail.NodeErrors = nodeErrors
clusterDetail.NodeK8sVersions = nodesK8sVersion
clusterDetail.NodeDetails = clusterNodeDetails
clusterDetail.SetStatus(nodeErrors)
clusterDetail.Cpu = &bean.ResourceDetailObject{
Capacity: getResourceString(clusterCpuCapacity, corev1.ResourceCPU),
}
Expand Down
2 changes: 1 addition & 1 deletion wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading