Verify that a target reflects its app's status

This commit expands the test a little to make sure that when an app
(HelmRelease, here) has its status updated, the pipeline's status is
updated in sympathy.

In making the test pass, this corrects a bug with the implementation
so far: when going through the environments in the controller, the
environment status was not entered into the map of environment
statuses.

Signed-off-by: Michael Bridgen <michael.bridgen@weave.works>

controllers/leveltriggered/controller.go

@@ -71,6 +71,7 @@ func (r *PipelineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 	for _, env := range pipeline.Spec.Environments {
 		var envStatus v1alpha1.EnvironmentStatus
 		envStatus.Targets = make([]v1alpha1.TargetStatus, len(env.Targets))
+		envStatuses[env.Name] = &envStatus
 
 		for i, target := range env.Targets {
 			targetStatus := &envStatus.Targets[i]

controllers/leveltriggered/controller_test.go

@@ -100,11 +100,43 @@ func TestReconcile(t *testing.T) {
 		pipeline := newPipeline(ctx, g, name, ns.Name, nil)
 		checkReadyCondition(ctx, g, client.ObjectKeyFromObject(pipeline), metav1.ConditionFalse, v1alpha1.TargetNotReadableReason)
 
-		_ = newApp(ctx, g, name, ns.Name) // the name of the pipeline is also used as the name in the appRef, in newPipeline(...)
+		hr := newApp(ctx, g, name, ns.Name) // the name of the pipeline is also used as the name in the appRef, in newPipeline(...)
 		checkReadyCondition(ctx, g, client.ObjectKeyFromObject(pipeline), metav1.ConditionTrue, v1alpha1.ReconciliationSucceededReason)
+
+		// we didn't set the app to be ready, so we should expect the target to be reported as unready
+		p := getPipeline(ctx, g, client.ObjectKeyFromObject(pipeline))
+		g.Expect(getTargetStatus(g, p, "test", 0).Ready).NotTo(BeTrue())
+
+		// make the app ready, and check it's recorded as such in the pipeline status
+		const appRevision = "v1.0.1"
+		hr.Status.LastAppliedRevision = appRevision
+		apimeta.SetStatusCondition(&hr.Status.Conditions, metav1.Condition{Type: "Ready", Status: metav1.ConditionTrue, Reason: "test"})
+		g.Expect(k8sClient.Status().Update(ctx, hr)).To(Succeed())
+
+		var targetStatus v1alpha1.TargetStatus
+		g.Eventually(func() bool {
+			p := getPipeline(ctx, g, client.ObjectKeyFromObject(pipeline))
+			targetStatus = getTargetStatus(g, p, "test", 0)
+			return targetStatus.Ready
+		}, "5s", "0.2s").Should(BeTrue())
+		g.Expect(targetStatus.Revision).To(Equal(appRevision))
 	})
 }
 
+func getPipeline(ctx context.Context, g Gomega, key client.ObjectKey) *v1alpha1.Pipeline {
+	var p v1alpha1.Pipeline
+	g.Expect(k8sClient.Get(ctx, key, &p)).To(Succeed())
+	return &p
+}
+
+func getTargetStatus(g Gomega, pipeline *v1alpha1.Pipeline, envName string, target int) v1alpha1.TargetStatus {
+	g.ExpectWithOffset(1, pipeline.Status).NotTo(BeNil())
+	g.ExpectWithOffset(1, pipeline.Status.Environments).To(HaveKey(envName))
+	env := pipeline.Status.Environments[envName]
+	g.ExpectWithOffset(1, len(env.Targets) > target).To(BeTrue())
+	return env.Targets[target]
+}
+
 func checkReadyCondition(ctx context.Context, g Gomega, n types.NamespacedName, status metav1.ConditionStatus, reason string) {
 	pipeline := &v1alpha1.Pipeline{}
 	assrt := g.Eventually(func() []metav1.Condition {