Backport of Update MatchesConsul to normalize partitions during comparison. into release/1.3.x #3295
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
hc-github-team-consul-core
force-pushed
the
backport/ashwin/NET-6700-normalize-partitions/partially-actual-pup
branch
from
10e4ac7
to
ceb6153
Compare
thisisnotashwin
approved these changes
Dec 1, 2023
hc-github-team-consul-core
merged commit 9309f3b
into
release/1.3.x
25 of 49 checks passed
hc-github-team-consul-core
deleted the
backport/ashwin/NET-6700-normalize-partitions/partially-actual-pup
branch
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
This PR is auto-generated from #3284 to be assessed for backporting due to the inclusion of the label backport/1.3.x.
The below text is copied from the body of the original PR.
Changes proposed in this PR:
When setup as a secondary in WAN federation, Consul migrates config entries from the primary datacenter into the kubernetes secondaries. When the config entries are saved, the
partitionfield in the spec of the config entries that have them, gets normalized to the valuedefaultif it was previously""in Consul Enterprise. CRDs for these resources then constantly re-sync themselves since theMatchesConsulmethod, which is responsible for identifying diffs, evaluates the match incorrectly.To normalize this behavior, the comparison operation for the impacted CRDs has been updated so that when the Partition fields are compared, empty strings are normalized to the value
default. This should ensure that those two values are considered symmetrical and hence should prevent the constant resync of the CRDs into Consul.How I've tested this PR:
How I expect reviewers to test this PR:
Checklist:
Overview of commits