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.

Sign up for GitHub

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

Jump to bottom

Backport of [NET-8412] Fix order of APIGW ACL policy/role creation into release/1.2.x #3802

Merged
merged 6 commits into from
Mar 25, 2024
Merged

Backport of [NET-8412] Fix order of APIGW ACL policy/role creation into release/1.2.x #3802

merged 6 commits into from
Mar 25, 2024

Conversation

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

Backport

This PR is auto-generated from #3779 to be assessed for backporting due to the inclusion of the label backport/1.2.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:
@jm96441n
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

  • cache role/policy for api-gateway so we know if we need to create so we avoid getting errors in consul around trying to create a role/policy that already exists

How I've tested this PR

How I expect reviewers to test this PR

Checklist

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Mar 21, 2024 •
edited

CLA assistant check
All committers have signed the CLA.

@jm96441n jm96441n marked this pull request as ready for review March 21, 2024 19:07
jm96441n and others added 5 commits March 25, 2024 14:15
@jm96441n
Reorder gateway policy and role creation to avoid error messages in c…
3cb1f34 
…onsul when policy/role already exists
@jm96441n
refactor for readability
31f3a37
@jm96441n
fix spacing
7cb3ba0
@jm96441n
Added changelog
0dfe84b
@hc-github-team-consul-core @NiniOak @jm96441n
Backport of improve reliability of acceptance tests into release/1.2.x (
9b869d8 
#3805)

* backport of commit 6e6f4c9

* backport of commit b3e66a8

* backport of commit 2c8bc07

---------

Co-authored-by: NiniOak <anita.akaeze@hashicorp.com>
@jm96441n jm96441n force-pushed the backport/NET-8412-fix-acl-policy-creation/supposedly-arriving-aardvark branch from d84fdc8 to 9b869d8 Compare March 25, 2024 18:15
@jm96441n jm96441n merged commit 897986b into release/1.2.x Mar 25, 2024
47 checks passed
@jm96441n jm96441n deleted the backport/NET-8412-fix-acl-policy-creation/supposedly-arriving-aardvark branch March 25, 2024 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jm96441n jm96441n jm96441n approved these changes

Assignees

@jm96441n jm96441n

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hc-github-team-consul-core @hashicorp-cla @jm96441n