Merge pull request #1793 from weaveworks/1710-helm-pipe-details

Show Helm Release status info on pipeline details view

api/pipelines/pipelines.swagger.json

@@ -151,6 +151,26 @@
         }
       }
     },
+    "v1Condition": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string"
+        },
+        "status": {
+          "type": "string"
+        },
+        "reason": {
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
+        },
+        "timestamp": {
+          "type": "string"
+        }
+      }
+    },
     "v1Environment": {
       "type": "object",
       "properties": {
@@ -283,6 +303,12 @@
         },
         "lastAppliedRevision": {
           "type": "string"
+        },
+        "conditions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/v1Condition"
+          }
         }
       }
     }

api/pipelines/types.proto

@@ -33,11 +33,20 @@ message AppRef {
     string name        = 3;
 }
 
+message Condition {
+    string type = 1;
+    string status = 2;
+    string reason = 3;
+    string message = 4;
+    string timestamp = 5;
+}
+
 message WorkloadStatus {
-    string kind    = 1;
-    string name    = 2;
-    string version = 3;
-    string lastAppliedRevision = 4;
+    string   kind                 = 1;
+    string   name                 = 2;
+    string   version              = 3;
+    string   lastAppliedRevision  = 4;
+    repeated Condition conditions = 5;
 }
 
 message PipelineTargetStatus {

pkg/pipelines/server/get.go

@@ -3,6 +3,7 @@ package server
 import (
 	"context"
 	"fmt"
+	"time"
 
 	helm "github.com/fluxcd/helm-controller/api/v2beta1"
 	ctrl "github.com/weaveworks/pipeline-controller/api/v1alpha1"
@@ -112,6 +113,16 @@ func getWorkloadStatus(obj *unstructured.Unstructured) (*pb.WorkloadStatus, erro
 		ws.Name = hr.Name
 		ws.Version = hr.Spec.Chart.Spec.Version
 		ws.LastAppliedRevision = hr.Status.LastAppliedRevision
+		ws.Conditions = []*pb.Condition{}
+		for _, c := range hr.Status.Conditions {
+			ws.Conditions = append(ws.Conditions, &pb.Condition{
+				Type:      c.Type,
+				Status:    string(c.Status),
+				Reason:    c.Reason,
+				Message:   c.Message,
+				Timestamp: c.LastTransitionTime.Format(time.RFC3339),
+			})
+		}
 	}
 
 	return ws, nil

ui-cra/src/api/pipelines/types.pb.ts

@@ -31,11 +31,20 @@ export type AppRef = {
   name?: string
 }
 
+export type Condition = {
+  type?: string
+  status?: string
+  reason?: string
+  message?: string
+  timestamp?: string
+}
+
 export type WorkloadStatus = {
   kind?: string
   name?: string
   version?: string
   lastAppliedRevision?: string
+  conditions?: Condition[]
 }
 
 export type PipelineTargetStatus = {

ui-cra/src/components/Pipelines/PipelineDetails/WorkloadStatus.tsx

@@ -0,0 +1,30 @@
+import { Flex, KubeStatusIndicator } from '@weaveworks/weave-gitops';
+import styled from 'styled-components';
+import { WorkloadStatus as WorkloadStatusType } from '../../../api/pipelines/types.pb';
+
+interface Props {
+  className?: string;
+  workload?: WorkloadStatusType;
+}
+
+function WorkloadStatus({ className, workload }: Props) {
+  return (
+    <div className={className}>
+      <Flex align>
+        <div style={{ marginRight: 4 }}>
+          <KubeStatusIndicator short conditions={workload?.conditions || []} />
+        </div>
+        <div>{workload?.name}</div>
+      </Flex>
+    </div>
+  );
+}
+
+export default styled(WorkloadStatus).attrs({ className: 'WorkloadStatus' })`
+  font-size: ${props => props.theme.fontSizes.large};
+
+  /* Hack to hide the text; we only want the icon here */
+  ${KubeStatusIndicator} span {
+    display: none;
+  }
+`;

ui-cra/src/components/Pipelines/PipelineDetails/__tests__/PipelineDetails.test.tsx

@@ -1,10 +1,11 @@
 /* eslint-disable testing-library/no-node-access */
 import { act, render, RenderResult, screen } from '@testing-library/react';
-import { formatURL } from '@weaveworks/weave-gitops';
+import { CoreClientContextProvider, formatURL } from '@weaveworks/weave-gitops';
 import PipelineDetails from '..';
 import { GetPipelineResponse } from '../../../../api/pipelines/pipelines.pb';
 import { PipelinesProvider } from '../../../../contexts/Pipelines';
 import {
+  CoreClientMock,
   defaultContexts,
   PipelinesClientMock,
   withContext,
@@ -156,14 +157,21 @@ interface MappedWorkload {
 describe('PipelineDetails', () => {
   let wrap: (el: JSX.Element) => JSX.Element;
   let api: PipelinesClientMock;
+  let core: CoreClientMock;
 
   beforeEach(() => {
     api = new PipelinesClientMock();
-    wrap = withContext([...defaultContexts(), [PipelinesProvider, { api }]]);
+    core = new CoreClientMock();
+    wrap = withContext([
+      ...defaultContexts(),
+      [PipelinesProvider, { api }],
+      [CoreClientContextProvider, { api: core }],
+    ]);
   });
   it('renders pipeline details', async () => {
     const params = res.pipeline;
     api.GetPipelineReturns = res;
+    core.GetObjectReturns = { object: {} };
 
     await act(async () => {
       const c = wrap(
@@ -230,20 +238,15 @@ describe('PipelineDetails', () => {
         );
 
         //Target as a link
-        const linkToAutomation = target.querySelector('.workloadName > a');
+        const linkToAutomation = target.querySelector('a');
+
         if (workloads![index].mappedClusterName) {
           const href = formatURL('/helm_release/details', {
             name: workloads![index].name,
             namespace: workloads![index].namespace,
             clusterName: workloads![index].mappedClusterName,
           });
           linkToExists(linkToAutomation, href);
-        } else {
-          elementToBeNull(linkToAutomation);
-          checkTextContentToEqual(
-            target.querySelector('.workload-name'),
-            workloads![index].name || '',
-          );
         }
         // Workload Last Applied Version
         const lastAppliedRevision = target.querySelector(