Workload Summary Pod/Container Ring Chart Fixes

- fix expanded pod status when there are terminated containers
- in container ready/not ready count ignore containers that were terminated succesfully
- sort pod status labels in pod status ring chart to reduce values switching

custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts

@@ -96,10 +96,9 @@ export class KubernetesPodExpandedStatusHelper {
           reason = state.waiting.reason;
         } else if (!!state.terminated) {
           reason = state.terminated.reason;
-        } else if (!!state.terminated) {
-          if (state.terminated.signal !== 0) {
+          if (!!state.terminated.signal && state.terminated.signal !== 0) {
             reason = `Signal:${state.terminated.signal}`;
-          } else {
+          } else if (!!state.terminated.exitCode && state.terminated.exitCode !== 0) {
             reason = `ExitCode:${state.terminated.exitCode}`;
           }
         } else if (!!container.ready && !!state.running) {

custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
-import { KubernetesPod } from '../../../store/kube.types';
+import { ContainerStateCollection, KubernetesPod } from '../../../store/kube.types';
 import { getHelmReleaseDetailsFromGuid } from '../../store/workloads-entity-factory';
 import {
   HelmRelease,
@@ -85,7 +85,7 @@ export class HelmReleaseHelperService {
       this.releaseTitle
     ).currentPage$.pipe(
       filter(pods => !!pods),
-      map(this.mapPods)
+      map(pods => this.mapPods(pods))
     );
   }
 
@@ -110,11 +110,13 @@ export class HelmReleaseHelperService {
       } else {
         podPhases[status]++;
       }
+
       if (pod.status.containerStatuses) {
         pod.status.containerStatuses.forEach(containerStatus => {
-          if (containerStatus.state.running) {
+          const isReady = this.isContainerReady(containerStatus.state);
+          if (isReady === true) {
             containers.ready.value++;
-          } else {
+          } else if (isReady === false) {
             containers.notReady.value++;
           }
         });
@@ -129,4 +131,17 @@ export class HelmReleaseHelperService {
       containersChartData: Object.values(containers)
     };
   }
+
+  private isContainerReady(state: ContainerStateCollection = {}): Boolean {
+    console.log(state);
+    if (state.running) {
+      return true;
+    } else if (!!state.waiting) {
+      return false;
+    } else if (!!state.terminated) {
+      // Assume a failed state is not ready (covers completed init states), discard success state
+      return state.terminated.exitCode === 0 ? null : false
+    }
+    return false;
+  }
 }

custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts

@@ -9,7 +9,7 @@ import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
 import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { combineLatest, Observable, ReplaySubject } from 'rxjs';
-import { filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
+import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
 import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors';
 import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
@@ -103,7 +103,15 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
-    this.chartData$ = this.helmReleaseHelper.fetchReleaseChartStats();
+    this.chartData$ = this.helmReleaseHelper.fetchReleaseChartStats().pipe(
+      distinctUntilChanged(),
+      map(chartData => ({
+        ...chartData,
+        containersChartData: chartData.containersChartData.sort((a, b) => a.name.localeCompare(b.name)),
+        podsChartData: chartData.podsChartData.sort((a, b) => a.name.localeCompare(b.name))
+      })
+      )
+    );
 
     this.resources$ = this.helmReleaseHelper.fetchReleaseGraph().pipe(
       map((graph: any) => {