[SHIPA-2024] Prunes dead apps from framework status when removing framework #171
Conversation
This file contains 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
DavisFrench
reviewed
Oct 19, 2021
cmd/ketch/framework_remove.go
Outdated
| @@ -48,6 +49,9 @@ func frameworkRemove(ctx context.Context, cfg config, options frameworkRemoveOpt | |||
| return fmt.Errorf("failed to get framework: %w", err) | |||
| } | |||
|
|
|||
| if err := pruneRemovedAppsFromStatus(ctx, cfg, framework); err != nil { | |||
| return fmt.Errorf("failed to update framework's apps: %w", err) | |||
There was a problem hiding this comment.
Do you think it would be better to have the message say failed to prune framework's apps: just for a little bit more clarification?
There was a problem hiding this comment.
It sure would. Change made.
DavisFrench
approved these changes
Oct 19, 2021
| patchedFramework := framework | ||
| patchedFramework.Status.Apps = updatedApps | ||
| patch := client.MergeFrom(&framework) | ||
| return cfg.Client().Status().Patch(ctx, &patchedFramework, patch) |
There was a problem hiding this comment.
Is there a chance to get the object has been modified; please apply your changes to the latest version and try again? retry.RetryOnConflict()?
There was a problem hiding this comment.
Good call. I added it around the entire pruneRemovedAppsFromStatus function.
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
Deleting a framework and it's apps simultaneously, e.g. terraform, script, etc. can occasionally create a situation where an app is removed, but is still in the framework's
framework.Status.Appslist. This can cause frustration since a user cannot remove the framework ("contains running apps" error) nor can they remove the already-removed app. This PR prunes non-existent apps from theframework.Status.Appslist prior to the framework delete.Fixes # 2024
Type of change
Testing
Documentation
Final Checklist: