Backport of Update MatchesConsul to normalize partitions during comparison. into release/1.1.x

[hc-github-team-consul-core]

Backport

This PR is auto-generated from #3284 to be assessed for backporting due to the inclusion of the label backport/1.1.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@thisisnotashwin
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

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 partition field in the spec of the config entries that have them, gets normalized to the value default if it was previously "" in Consul Enterprise. CRDs for these resources then constantly re-sync themselves since the MatchesConsul method, 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:

• Unit tests.
• Tested on env where this behavior was previously observed and has now stopped occurring.

How I expect reviewers to test this PR:

• Kind eyes and a whimsical smile. Also, suggestions for additional test cases if you come across them.

Checklist:

• Tests added
• CHANGELOG entry added

---

Overview of commits

• b44a7b7 - 0e60896

[hashicorp-cla]

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes

---

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

_{Have you signed the CLA already but the status is still pending? Recheck it.}