Skip to content

fix(PLT-6661): manage finalizers by using update instead of apply #36

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

Merged
davidmdm merged 1 commit into from
Aug 10, 2026
Merged

fix(PLT-6661): manage finalizers by using update instead of apply #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions cmd/operator/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func TestHappyReconciliations(t *testing.T) {
Repository: "org/repo",
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests"},
)
require.NoError(t, err)

Expand Down Expand Up @@ -287,7 +287,7 @@ func TestHappyReconciliations(t *testing.T) {
},
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests"},
)
require.NoError(t, err)

Expand All @@ -309,7 +309,7 @@ func TestHappyReconciliations(t *testing.T) {
},
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests"},
)
require.NoError(t, err)

Expand Down Expand Up @@ -353,7 +353,7 @@ func TestHappyReconciliations(t *testing.T) {
},
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests"},
)
require.NoError(t, err)

Expand Down Expand Up @@ -630,7 +630,7 @@ func TestEnvironmentSourcePattern(t *testing.T) {
Revision: "main",
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests"},
)
require.NoError(t, err)

Expand Down Expand Up @@ -708,7 +708,7 @@ func TestReleasePruning(t *testing.T) {
Repository: "org/repo",
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests", Force: true},
)
require.NoError(t, err)

Expand Down Expand Up @@ -744,7 +744,7 @@ func TestReleasePruning(t *testing.T) {
},
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests", Force: true},
)
require.NoError(t, err)

Expand All @@ -766,7 +766,7 @@ func TestReleasePruning(t *testing.T) {
},
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests", Force: true},
)
require.NoError(t, err)

Expand Down Expand Up @@ -813,7 +813,7 @@ func TestReleasePruning(t *testing.T) {
},
},
},
metav1.ApplyOptions{FieldManager: joyOperator},
metav1.ApplyOptions{FieldManager: "e2e-tests", Force: true},
)
require.NoError(t, err)

Expand Down
8 changes: 4 additions & 4 deletions cmd/operator/reconciler_release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ func ReleaseReconciler(params ReleaseReconcilerParams) ctrl.Funcs {
switch {
case shouldPrune && !hasPruneReleaseFinalizer:
release.Finalizers = append(release.Finalizers, finalizerPruneRelease)
if _, err := releaseIntf.Apply(ctx, release, metav1.ApplyOptions{FieldManager: joyOperator, Force: true}); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to apply prune-release finalizer: %w", err)
if _, err := releaseIntf.Update(ctx, release, metav1.UpdateOptions{FieldManager: joyOperator}); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to add prune-release finalizer: %w", err)
}
return ctrl.Result{}, nil
case !shouldPrune && hasPruneReleaseFinalizer:
release.Finalizers = slices.DeleteFunc(release.Finalizers, func(finalizer string) bool { return finalizer == finalizerPruneRelease })
if _, err := releaseIntf.Apply(ctx, release, metav1.ApplyOptions{FieldManager: joyOperator, Force: true}); err != nil {
if _, err := releaseIntf.Update(ctx, release, metav1.UpdateOptions{FieldManager: joyOperator}); err != nil {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
return ctrl.Result{}, fmt.Errorf("failed to remove prune-release finalizer: %w", err)
}
return ctrl.Result{}, nil
Expand All @@ -106,7 +106,7 @@ func ReleaseReconciler(params ReleaseReconcilerParams) ctrl.Funcs {
}
if hasPruneReleaseFinalizer {
release.Finalizers = slices.DeleteFunc(release.Finalizers, func(finalizer string) bool { return finalizer == finalizerPruneRelease })
if _, err := releaseIntf.Apply(ctx, release, metav1.ApplyOptions{FieldManager: joyOperator, Force: true}); err != nil {
if _, err := releaseIntf.Update(ctx, release, metav1.UpdateOptions{FieldManager: joyOperator}); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to remove prune-release finalizer post app deletion: %w", err)
}
}
Expand Down