Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkg/revision/prune.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,17 @@ func PruneInactive(ctx context.Context, cl client.Client, ownerUID types.UID, ac
continue
}
inUseCondition := rev.Status.GetCondition(v1.IstioRevisionConditionInUse)
inUse := inUseCondition.Status == metav1.ConditionTrue
if inUse {

// Only prune revisions that are confirmed to be not in use (i.e., ConditionFalse).
// Skip revisions that are in use (ConditionTrue) or whose usage status is unknown (ConditionUnknown).
if inUseCondition.Status == metav1.ConditionTrue {
log.V(2).Info("IstioRevision is in use", "IstioRevision", rev.Name)
continue
}
if inUseCondition.Status != metav1.ConditionFalse {
log.V(2).Info("IstioRevision usage status is unknown, skipping pruning", "IstioRevision", rev.Name)
continue
}

pruneTimestamp := inUseCondition.LastTransitionTime.Time.Add(gracePeriod)
expired := pruneTimestamp.Before(time.Now())
Expand Down
30 changes: 28 additions & 2 deletions pkg/revision/prune_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,29 @@ func TestPruneInactive(t *testing.T) {
expectDeletion: true,
expectRequeueAfter: ptr.Of((v1.DefaultRevisionDeletionGracePeriodSeconds - 25) * time.Second),
},
{
name: "preserves non-active IstioRevision with unknown usage status",
revName: istioName + "-non-active",
ownerReference: ownedByIstio,
inUseCondition: &v1.IstioRevisionCondition{
Type: v1.IstioRevisionConditionInUse,
Status: metav1.ConditionUnknown,
Reason: v1.IstioRevisionReasonUsageCheckFailed,
Message: "failed to determine if revision is in use",
LastTransitionTime: oneMinuteAgo,
},
expectDeletion: false,
expectRequeueAfter: nil,
},
{
name: "preserves non-active IstioRevision with missing InUse condition",
revName: istioName + "-non-active",
ownerReference: ownedByIstio,
// No InUse condition is set to simulate GetCondition returning ConditionUnknown
inUseCondition: nil,
expectDeletion: false,
expectRequeueAfter: nil,
},
}

for _, tc := range testCases {
Expand All @@ -191,9 +214,12 @@ func TestPruneInactive(t *testing.T) {
Name: tc.revName,
OwnerReferences: []metav1.OwnerReference{tc.ownerReference},
},
Status: v1.IstioRevisionStatus{
}

if tc.inUseCondition != nil {
rev.Status = v1.IstioRevisionStatus{
Conditions: []v1.IstioRevisionCondition{*tc.inUseCondition},
},
}
}

initObjs := []client.Object{istio, rev}
Expand Down