[BACKPORT] Fix infinite resource updates due to canonical format conversion of resource requirements #2568
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
Signed-off-by: David Sondermann <david.sondermann@hivemq.com>
… SSABasedGenericKubernetesResourceMatcher Signed-off-by: David Sondermann <david.sondermann@hivemq.com>
… of resource requirements Signed-off-by: David Sondermann <david.sondermann@hivemq.com>
…tizerTest Signed-off-by: David Sondermann <david.sondermann@hivemq.com>
Donnerbart
commented
Nov 6, 2024
| StatefulSet actualStatefulSet = (StatefulSet) actual; | ||
| int claims = desiredStatefulSet.getSpec().getVolumeClaimTemplates().size(); | ||
| if (claims == actualStatefulSet.getSpec().getVolumeClaimTemplates().size()) { | ||
| if (actual instanceof StatefulSet) { |
There was a problem hiding this comment.
Had to adapt this from if (desired instanceof StatefulSet desiredStatefulSet) to the good old cast style. This should be the main difference between the original fix and the backport.
Signed-off-by: David Sondermann <david.sondermann@hivemq.com>
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.
Backport of #2565
I've cherry-picked the commits on the main branch. There were some merge conflicts in
SSABasedGenericKubernetesResourceMatcherdue to the different Java versions and a other differences in the class that I cleaned up innext. Also some tests fromnextare not yet inSSABasedGenericKubernetesResourceMatcherTest, which lead to a minimal merge conflict as well. So nothing unexpected or hard to resolve.