Fix plan marked as completed when template was broken

pkg/controller/planexecution/planexecution_controller.go

@@ -370,6 +370,10 @@ func (r *ReconcilePlanExecution) Reconcile(request reconcile.Request) (reconcile
 							if err != nil {
 								r.recorder.Event(planExecution, "Warning", "InvalidPlanExecution", fmt.Sprintf("Error expanding template: %v", err))
 								log.Printf("PlanExecutionController: Error expanding template: %v", err)
+								planExecution.Status.State = kudov1alpha1.PhaseStateError
+								planExecution.Status.Phases[i].State = kudov1alpha1.PhaseStateError
+								// returning error = nil so that we don't retry since this is non-recoverable
+								return reconcile.Result{}, nil
 							}
 							fsys.WriteFile(fmt.Sprintf("%s/%s", basePath, res), []byte(templatedYaml))
 							resources = append(resources, res)
@@ -449,7 +453,7 @@ func (r *ReconcilePlanExecution) Reconcile(request reconcile.Request) (reconcile
 			planExecution.Status.Phases[i].Steps[j].Name = step.Name
 			planExecution.Status.Phases[i].Steps[j].Objects = objs
 			planExecution.Status.Phases[i].Steps[j].Delete = step.Delete
-			log.Printf("PlanExecutionController: Phase \"%v\" Step \"%v\" has %v object(s)", phase.Name, step.Name, len(objs))
+			log.Printf("PlanExecutionController: Phase \"%v\" Step \"%v\" of instance '%v' has %v object(s)", phase.Name, step.Name, instance.Name, len(objs))
 		}
 	}
 

test/integration/rendering-error-plan-failed/00-assert.yaml

@@ -0,0 +1,18 @@
+apiVersion: kudo.k8s.io/v1alpha1
+kind: PlanExecution
+metadata:
+  labels:
+    instance: invalid1
+    operator-version: invalid-v1
+  ownerReferences:
+    - apiVersion: kudo.k8s.io/v1alpha1
+      blockOwnerDeletion: true
+      controller: true
+      kind: Instance
+      name: invalid1
+status:
+  name: deploy
+  state: ERROR
+  phases:
+  - name: invalid-phase
+    state: ERROR

test/integration/rendering-error-plan-failed/00-install.yaml

@@ -0,0 +1,73 @@
+apiVersion: kudo.k8s.io/v1alpha1
+kind: Operator
+metadata:
+  labels:
+    controller-tools.k8s.io: "1.0"
+  name: invalid
+---
+apiVersion: kudo.k8s.io/v1alpha1
+kind: OperatorVersion
+metadata:
+  labels:
+    controller-tools.k8s.io: "1.0"
+  name: invalid-v1
+spec:
+  version: "1.0.0"
+  connectionString: ""
+  operator:
+    name: Toy
+    kind: Operator
+  templates:
+    serial.yaml: |
+      apiVersion: batch/v1
+      kind: Job
+      metadata:
+        name: serial-{{ .StepName }}
+      spec:
+        template:
+          metadata:
+            name: "{{ .StepName }}-serial-{{ .StepNumber }}"
+          spec:
+            restartPolicy: OnFailure
+            containers:
+            - name: bb
+              image: busybox:latest
+              imagePullPolicy: IfNotPresent
+              command:
+              - /bin/sh
+              - -c
+              - "sleep {{ .Params.NonExisting }}"
+  tasks:
+    invalid-task:
+      resources:
+        - serial.yaml
+  parameters:
+    - name: Sleep
+      description: "how long to have the container sleep for before returning"
+      required: true
+      displayName: "Sleep Time"
+  plans:
+    deploy:
+      strategy: serial
+      phases:
+        - name: invalid-phase
+          strategy: serial
+          steps:
+            - name: invalid-step
+              tasks:
+                - invalid-task
+---
+apiVersion: kudo.k8s.io/v1alpha1
+kind: Instance
+metadata:
+  labels:
+    controller-tools.k8s.io: "1.0"
+    operator: invalid
+  name: invalid1
+spec:
+  operatorVersion:
+    name: invalid-v1
+    type: OperatorVersions
+  # Add fields here
+  parameters:
+    Sleep: "30"