Bugfix: IntegrationTest TestRestartController (#1313)

Signed-off-by: Ken Sipe <kensipe@gmail.com>
kudobuilder · Jan 28, 2020 · 8df525a · 8df525a
1 parent 8b67df5
commit 8df525a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/pkg/apis/kudo/v1beta1/instance_types.go b/pkg/apis/kudo/v1beta1/instance_types.go
@@ -89,7 +89,7 @@ type PlanStatus struct {
 	Status  ExecutionStatus `json:"status,omitempty"`
 	Message string          `json:"message,omitempty"` // more verbose explanation of the status, e.g. a detailed error message
 	// +nullable
-	LastFinishedRun metav1.Time           `json:"lastFinishedRun,omitempty"`
+	LastFinishedRun *metav1.Time          `json:"lastFinishedRun,omitempty"`
 	Phases          []PhaseStatus         `json:"phases,omitempty"`
 	UID             apimachinerytypes.UID `json:"uid,omitempty"`
 }

diff --git a/pkg/apis/kudo/v1beta1/instance_types_helpers.go b/pkg/apis/kudo/v1beta1/instance_types_helpers.go
@@ -118,7 +118,7 @@ func (i *Instance) PlanStatus(plan string) *PlanStatus {
 
 // wasRunAfter returns true if p1 was run after p2
 func wasRunAfter(p1 PlanStatus, p2 PlanStatus) bool {
-	if p1.Status == ExecutionNeverRun || p2.Status == ExecutionNeverRun {
+	if p1.Status == ExecutionNeverRun || p2.Status == ExecutionNeverRun || p1.LastFinishedRun == nil || p2.LastFinishedRun == nil {
 		return false
 	}
 	return p1.LastFinishedRun.Time.After(p2.LastFinishedRun.Time)

diff --git a/pkg/apis/kudo/v1beta1/instance_types_helpers_test.go b/pkg/apis/kudo/v1beta1/instance_types_helpers_test.go
@@ -56,13 +56,13 @@ func TestGetLastExecutedPlanStatus(t *testing.T) {
 			"test": {
 				Status:          ExecutionComplete,
 				Name:            "test",
-				LastFinishedRun: metav1.Time{Time: testTime},
+				LastFinishedRun: &metav1.Time{Time: testTime},
 				Phases:          []PhaseStatus{{Name: "phase", Status: ExecutionComplete, Steps: []StepStatus{{Status: ExecutionComplete, Name: "step"}}}},
 			},
 			"test2": {
 				Status:          ExecutionComplete,
 				Name:            "test2",
-				LastFinishedRun: metav1.Time{Time: testTime.Add(time.Hour)},
+				LastFinishedRun: &metav1.Time{Time: testTime.Add(time.Hour)},
 				Phases:          []PhaseStatus{{Name: "phase", Status: ExecutionComplete, Steps: []StepStatus{{Status: ExecutionComplete, Name: "step"}}}},
 			}}, "test2"},
 	}
@@ -105,7 +105,7 @@ func TestInstance_ResetPlanStatus(t *testing.T) {
 				"deploy": {
 					Status:          ExecutionInProgress,
 					Name:            "deploy",
-					LastFinishedRun: metav1.Time{Time: testTime},
+					LastFinishedRun: &metav1.Time{Time: testTime},
 					UID:             testUUID,
 					Phases:          []PhaseStatus{{Name: "phase", Status: ExecutionInProgress, Steps: []StepStatus{{Status: ExecutionInProgress, Name: "step"}}}},
 				},
@@ -144,7 +144,7 @@ func TestInstance_ResetPlanStatus(t *testing.T) {
 			"deploy": {
 				Status:          ExecutionPending,
 				Name:            "deploy",
-				LastFinishedRun: metav1.Time{Time: testTime},
+				LastFinishedRun: &metav1.Time{Time: testTime},
 				UID:             testUUID,
 				Phases:          []PhaseStatus{{Name: "phase", Status: ExecutionPending, Steps: []StepStatus{{Status: ExecutionPending, Name: "step"}}}},
 			},

diff --git a/pkg/apis/kudo/v1beta1/zz_generated.deepcopy.go b/pkg/apis/kudo/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/controller/instance/instance_controller_test.go b/pkg/controller/instance/instance_controller_test.go
@@ -74,7 +74,7 @@ func TestRestartController(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "foo-operator", Namespace: "default"},
 		TypeMeta:   metav1.TypeMeta{Kind: "OperatorVersion", APIVersion: "kudo.dev/v1beta1"},
 		Spec: v1beta1.OperatorVersionSpec{
-			Plans: map[string]v1beta1.Plan{"deploy": {}, "update": {}},
+			Plans: map[string]v1beta1.Plan{"deploy": {Phases: []v1beta1.Phase{}}, "update": {Phases: []v1beta1.Phase{}}},
 			Parameters: []v1beta1.Parameter{
 				{
 					Name:    "param",

diff --git a/pkg/engine/workflow/engine.go b/pkg/engine/workflow/engine.go
@@ -223,7 +223,7 @@ func Execute(pl *ActivePlan, em *engine.Metadata, c client.Client, enh renderer.
 	if phasesLeft == 0 {
 		log.Printf("PlanExecution: %s/%s all phases of the plan %s are ready", em.InstanceNamespace, em.InstanceName, pl.Name)
 		planStatus.Set(v1beta1.ExecutionComplete)
-		planStatus.LastFinishedRun = v1.Time{Time: currentTime}
+		planStatus.LastFinishedRun = &v1.Time{Time: currentTime}
 	}
 
 	return planStatus, nil

diff --git a/pkg/engine/workflow/engine_test.go b/pkg/engine/workflow/engine_test.go
@@ -107,7 +107,7 @@ func TestExecutePlan(t *testing.T) {
 			metadata: meta,
 			expectedStatus: &v1beta1.PlanStatus{
 				Status:          v1beta1.ExecutionComplete,
-				LastFinishedRun: v1.Time{Time: timeNow},
+				LastFinishedRun: &v1.Time{Time: timeNow},
 				Name:            "test",
 				Phases:          []v1beta1.PhaseStatus{{Name: "phase", Status: v1beta1.ExecutionComplete, Steps: []v1beta1.StepStatus{{Status: v1beta1.ExecutionComplete, Name: "step"}}}},
 			},
@@ -140,7 +140,7 @@ func TestExecutePlan(t *testing.T) {
 			metadata: meta,
 			expectedStatus: &v1beta1.PlanStatus{
 				Status:          v1beta1.ExecutionComplete,
-				LastFinishedRun: v1.Time{Time: timeNow},
+				LastFinishedRun: &v1.Time{Time: timeNow},
 				Name:            "test",
 				Phases:          []v1beta1.PhaseStatus{{Name: "phase", Status: v1beta1.ExecutionComplete, Steps: []v1beta1.StepStatus{{Status: v1beta1.ExecutionComplete, Name: "step"}}}},
 			},

diff --git a/pkg/kudoctl/cmd/plan/plan_history.go b/pkg/kudoctl/cmd/plan/plan_history.go
@@ -59,7 +59,7 @@ func planHistory(options *Options, settings *env.Settings) error {
 	for _, p := range instance.Status.PlanStatus {
 		msg := "never run" // this is for the cases when status was not yet populated
 
-		if !p.LastFinishedRun.IsZero() { // plan already finished
+		if p.LastFinishedRun != nil && !p.LastFinishedRun.IsZero() { // plan already finished
 			t := p.LastFinishedRun.Format(timeLayout)
 			msg = fmt.Sprintf("last finished run at %s (%s)", t, string(p.Status))
 		} else if p.Status.IsRunning() {