fix: remove EdgeConnect finalizer only after tenant cleanup succeeds#6534
Open
knQzx wants to merge 1 commit intoDynatrace:mainfrom
Open
fix: remove EdgeConnect finalizer only after tenant cleanup succeeds#6534knQzx wants to merge 1 commit intoDynatrace:mainfrom
knQzx wants to merge 1 commit intoDynatrace:mainfrom
Conversation
reconcileEdgeConnectDeletion previously cleared the finalizer before talking to the tenant. if buildEdgeConnectClient, getEdgeConnectByName or DeleteEdgeConnect failed (oauth secret rotated, tenant unreachable, etc.) the k8s object was already gc-able while the tenant resource stayed orphaned forever. now we run tenant cleanup first and only call RemoveFinalizer after it succeeds, so a transient failure leaves the finalizer in place and the controller retries on the next reconcile.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
description
reconcileEdgeConnectDeletionclears the finalizer and persists it BEFORE running tenant cleanup (buildEdgeConnectClient,getEdgeConnectByName,deleteConnectionSetting,DeleteEdgeConnect). if any step fails the k8s object has already lost its finalizer and gets garbage collected. tenant resource is orphaned foreverroot cause
been there since
8fa3f094d("Add edgeconnect provisioner mode") - no test for the failure path, no comment, no rationalefix
controllerutil.RemoveFinalizerafter successcleanupTenantEdgeConnecthelperFinalizers = niltocontrollerutil.RemoveFinalizerso third-party finalizers don't get wipedhow can this be tested?
existing edgeconnect tests pass
two new regression tests in
controller_test.go:finalizer is kept when DeleteEdgeConnect failsfinalizer is kept when buildEdgeConnectClient failsboth fail on main (object gets GC'd, finalizer gone) and pass on this branch
note for operators
if the OAuth secret or
caCertsRefconfigmap is deleted before the EdgeConnect CR,buildEdgeConnectClientfails and deletion gets retried indefinitely. recovery: recreate the secret/configmap orkubectl patchthe finalizer off