Do not overwrite deployment status when reconciling #6302
Merged
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
barkbay
reviewed
Jan 16, 2023
| @@ -71,7 +72,12 @@ func Reconcile( | |||
| return hash.GetTemplateHashLabel(reconciled.Labels) != hash.GetTemplateHashLabel(expected.Labels) | |||
| }, | |||
| UpdateReconciled: func() { | |||
| expected.DeepCopyInto(reconciled) | |||
| // set expected annotations and labels, but don't remove existing ones | |||
There was a problem hiding this comment.
Maybe it's something I realised a while ago and forgot, but this change is not strictly required since the reconciler never updates the status: params.Client.Update(params.Context, params.Reconciled) here leaves the status untouched. I noticed it when I reverted the change to expected.DeepCopyInto(reconciled) and realised that the unit test still succeeded.
There was a problem hiding this comment.
That's because my unit test was flawed 😞 I compared with a version of the Deployment that had not really been updated because the template hash was the same. With an additional assertion it fails as expected.
barkbay
approved these changes
Jan 16, 2023
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.
Updating the deployment status should only be done by the deployment controller and not by the ECK operator.