fix(k8s): compareDeployedResources & manifest hash annotations #3386
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
compareDeployedResources actually just skipped isSubset check in case
the manifest hash was present.
Now it actually returns "outdated" when manifest hash differs.
This is necessary if the manifest removes annotations that are
present in the deployed manifest.
E.g.:
1. upsert annotations: {"some-annotation": "present"}
2. upsert annotations: {}
before this change, compareDeployedResources just returned "ready"
even though the deployedManifest was actually outdated (the annotation
needed to be removed)
This commit fixes that
previously we added garden manifest-hash only for kubectl apply ops. This commit makes sure to add the manifest-hash also for upserts. This enables for more accurate (and quicker) comparison results in compareDeployedResources for the affected resources.
stefreak
force-pushed
the
fix-compareDeployedResources
branch
from
e12d77a to
10b2d1c
Compare
stefreak
commented
Nov 25, 2022
| continue | ||
| if (lastAppliedHashed) { | ||
| const calculated = await hashManifest(manifest) | ||
| if (calculated !== lastAppliedHashed) { |
There was a problem hiding this comment.
Probably we should keep the continue if it's equal – that way we are saving some cpu cycles.
There was a problem hiding this comment.
Suggested change
| if (calculated !== lastAppliedHashed) { | |
| if (calculated === lastAppliedHashed) { | |
| continue | |
| } else { |
stefreak
commented
Nov 25, 2022
| @@ -597,6 +597,17 @@ export class KubeApi { | |||
| obj: O | |||
| log: LogEntry | |||
| }) { | |||
| // Hash the raw input and add as an annotation on each manifest (this is helpful beyond kubectl's own annotation, | |||
There was a problem hiding this comment.
this code block is copied from apply() and should be extracted to a helper method
|
There are some test failures. I'll convert this to a draft, and will try to take a look later this week. |
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.
What this PR does / why we need it:
compareDeployedResources actually just skipped isSubset check in case
the manifest hash was present.
Now it actually returns "outdated" when manifest hash differs.
This is necessary if the manifest removes annotations that are
present in the deployed manifest.
E.g.:
before this change, compareDeployedResources just returned "ready"
even though the deployedManifest was actually outdated (the annotation
needed to be removed)
This commit fixes that
previously we added garden manifest-hash only for kubectl apply ops.
This commit makes sure to add the manifest-hash also for upserts.
This enables for more accurate (and quicker) comparison results in
compareDeployedResources for the affected resources.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer: