Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of GH-3406 - Only error for config entries from different datacenters when the config entries are different into release/1.1.x #3929

Merged
merged 1 commit into from
Apr 20, 2024

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #3873 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:
@jmurret
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.


Fixes #3406

Changes proposed in this PR

How I've tested this PR

How I expect reviewers to test this PR

Checklist


Overview of commits

Copy link

hashicorp-cla-app bot commented Apr 19, 2024

CLA assistant check
All committers have signed the CLA.

Copy link

CLA assistant check

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 have already 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.

@jmurret jmurret force-pushed the backport/jm/gh-3406/poorly-settling-moth branch from 10af5cd to c4f9288 Compare April 20, 2024 00:00
…en the config entries are different (#3873)

* GH-3406 - Only error for config entries from different datacenters when the config entries are different

* add changelog

* fixing tests and logic

* refactoring code to make tests pass and also use a switch statement for readability and also get rid of intermediate state flag of requireMigration in a long iterative section of code.
@jmurret jmurret force-pushed the backport/jm/gh-3406/poorly-settling-moth branch from c4f9288 to 38f5dec Compare April 20, 2024 00:01
@jmurret jmurret marked this pull request as ready for review April 20, 2024 00:25
@jmurret jmurret enabled auto-merge (squash) April 20, 2024 00:25
@jmurret jmurret merged commit c2a184f into release/1.1.x Apr 20, 2024
23 of 44 checks passed
@jmurret jmurret deleted the backport/jm/gh-3406/poorly-settling-moth branch April 20, 2024 00:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants