Skip to content

Commit 73e01e9

Browse files
committed
feat(upgradepipeline): wip
1 parent c5b2f8b commit 73e01e9

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

controllers/upgradepipelinestep_controller.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,16 @@ func (r *UpgradePipelineStepController) lookupStep(ctx context.Context, cr *v1al
162162

163163
func (*UpgradePipelineStepController) applyStatus(cr *v1alpha1.UpgradePipelineStep, step upgradepipeline.StepOut) {
164164
cr.Status.ID = step.StepId
165-
cr.Status.LastValidation = &v1alpha1.UpgradePipelineStepLastValidationStatus{
165+
lastValidation := &v1alpha1.UpgradePipelineStepLastValidationStatus{
166166
Comment: step.LastValidation.Comment,
167167
ValidatedAt: NilIfZero(metav1.NewTime(step.LastValidation.ValidatedAt)),
168168
ValidatedByUser: step.LastValidation.ValidatedByUser,
169169
}
170+
if lastValidation.Comment == "" && lastValidation.ValidatedAt == nil && lastValidation.ValidatedByUser == "" {
171+
cr.Status.LastValidation = nil
172+
} else {
173+
cr.Status.LastValidation = lastValidation
174+
}
170175
meta.SetStatusCondition(&cr.Status.Conditions, getRunningCondition(metav1.ConditionTrue, "CheckRunning", "Instance is running on Aiven side"))
171176
metav1.SetMetaDataAnnotation(&cr.ObjectMeta, instanceIsRunningAnnotation, "true")
172177
}

controllers/upgradepipelinestep_controller_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func TestUpgradePipelineStepReconciler(t *testing.T) {
105105
require.NoError(t, r.Get(t.Context(), types.NamespacedName{Name: step.Name, Namespace: step.Namespace}, got))
106106
require.Contains(t, got.Finalizers, instanceDeletionFinalizer)
107107
require.Equal(t, "step-create", got.Status.ID)
108+
require.Nil(t, got.Status.LastValidation)
108109
require.Equal(t, "1", got.Annotations[processedGenerationAnnotation])
109110
require.Equal(t, "true", got.Annotations[instanceIsRunningAnnotation])
110111
})

0 commit comments

Comments
 (0)