Skip to content

Fix for Finalizers not running for Pods already terminating on start #972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix for Finalizers not running for Pods already terminating on start #972

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4c0808
Replicate behaviour of Finalize on Modify to also occur on Add events.
DaneRushtonVista Oct 20, 2025
f450cc7
Rework to reduce duplicated code.
DaneRushtonVista Oct 28, 2025
0663702
Merge branch 'main' into feature/finalize-on-add
DaneRushtonVista Oct 28, 2025
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
42 changes: 20 additions & 22 deletions src/KubeOps.Operator/Watcher/ResourceWatcher{TEntity}.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,13 @@ protected virtual async Task OnEventAsync(WatchEventType type, TEntity entity, C
{
MaybeValue<long?> cachedGeneration;

// Make sure Finalizers are running if Termination has began.
if (type != WatchEventType.Deleted && entity.Metadata.DeletionTimestamp is not null && entity.Metadata.Finalizers.Count > 0)
{
await ReconcileFinalizersSequentialAsync(entity, cancellationToken);
return;
}

switch (type)
{
case WatchEventType.Added:
Expand All @@ -161,31 +168,22 @@ protected virtual async Task OnEventAsync(WatchEventType type, TEntity entity, C

break;
case WatchEventType.Modified:
switch (entity)
{
case { Metadata.DeletionTimestamp: null }:
cachedGeneration = await _entityCache.TryGetAsync<long?>(entity.Uid(), token: cancellationToken);

// Check if entity spec has changed through "Generation" value increment. Skip reconcile if not changed.
if (cachedGeneration.HasValue && cachedGeneration >= entity.Generation())
{
logger.LogDebug(
"""Entity "{Kind}/{Name}" modification did not modify generation. Skip event.""",
entity.Kind,
entity.Name());
return;
}

// update cached generation since generation now changed
await _entityCache.SetAsync(entity.Uid(), entity.Generation() ?? 1, token: cancellationToken);
await ReconcileModificationAsync(entity, cancellationToken);
cachedGeneration = await _entityCache.TryGetAsync<long?>(entity.Uid(), token: cancellationToken);

break;
case { Metadata: { DeletionTimestamp: not null, Finalizers.Count: > 0 } }:
await ReconcileFinalizersSequentialAsync(entity, cancellationToken);
break;
// Check if entity spec has changed through "Generation" value increment. Skip reconcile if not changed.
if (cachedGeneration.HasValue && cachedGeneration >= entity.Generation())
{
logger.LogDebug(
"""Entity "{Kind}/{Name}" modification did not modify generation. Skip event.""",
entity.Kind,
entity.Name());
return;
}

// update cached generation since generation now changed
await _entityCache.SetAsync(entity.Uid(), entity.Generation() ?? 1, token: cancellationToken);
await ReconcileModificationAsync(entity, cancellationToken);

break;
case WatchEventType.Deleted:
await ReconcileDeletionAsync(entity, cancellationToken);
Expand Down