Skip to content

Commit

Permalink
EVEREST-1084: empty started if zero (#364)
Browse files Browse the repository at this point in the history
  • Loading branch information
Michal Kralik authored Jun 4, 2024
1 parent a1a0930 commit c0140c7
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions api/database_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ func (e *EverestServer) GetDatabaseCluster(ctx echo.Context, namespace, name str
}

// GetDatabaseClusterComponents returns database cluster components.
//
//nolint:funlen
func (e *EverestServer) GetDatabaseClusterComponents(ctx echo.Context, namespace, name string) error {
pods, err := e.kubeClient.GetPods(ctx.Request().Context(), namespace, &metav1.LabelSelector{
MatchLabels: map[string]string{"app.kubernetes.io/instance": name},
Expand Down Expand Up @@ -150,19 +152,27 @@ func (e *EverestServer) GetDatabaseClusterComponents(ctx echo.Context, namespace
status = "Terminated"
}

var startedString *string
if !started.IsZero() {
startedString = pointer.ToString(started.Format(time.RFC3339))
}
containers = append(containers, DatabaseClusterComponentContainer{
Name: &c.Name, //nolint:gosec,exportloopref
Started: pointer.ToString(started.Format(time.RFC3339)),
Started: startedString,
Restarts: pointer.ToInt(int(c.RestartCount)),
Status: &status,
})
}
component := pod.Labels["app.kubernetes.io/component"]
var started *string
if !pod.Status.StartTime.Time.IsZero() {
started = pointer.ToString(pod.Status.StartTime.Time.Format(time.RFC3339))
}
res = append(res, DatabaseClusterComponent{
Status: pointer.ToString(string(pod.Status.Phase)),
Name: &pod.Name, //nolint:gosec,exportloopref
Type: &component,
Started: pointer.ToString(pod.Status.StartTime.Time.Format(time.RFC3339)),
Started: started,
Restarts: pointer.ToInt(restarts),
Ready: pointer.ToString(fmt.Sprintf("%d/%d", ready, len(pod.Status.ContainerStatuses))),
Containers: &containers,
Expand Down

0 comments on commit c0140c7

Please sign in to comment.