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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of [NET-10247] Add Partition and Namespace blocks to external registration acl role/policy into release/1.5.x #4165

Conversation

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

Backport

This PR is auto-generated from #4153 to be assessed for backporting due to the inclusion of the label backport/1.5.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: unable to process merge commit: "a17874dfef83ccb83f2b4112083bd20a7ac9fb7b", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


NOTE: Dependent on hashicorp/consul#21382

Changes proposed in this PR

  • Add Partition and Namespace blocks to external registration acl role/policy
  • Make address field optional in the CRD like it is for catalog registraton
  • update license headers

How I've tested this PR

  • run the start.sh script in the following gist (ensure you have a local build of this branch and of the changes in the linked consul PR in consul-enterprise and have a valid consul license in an env variable named CONSUL_LICENSE
  • shell into the bender service and run apk add curl
  • run curl zoidberg.virtual.consul and see the request go through
  • check the consul connect injector logs to see there are no errors
  • view the zoidberg-write-policy to see the namespace block applied

How I expect reviewers to test this PR

Checklist


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-10247-add-parition-and-namespace-to-policy/pleasantly-refined-goblin branch from 2e740c0 to eee639b Compare July 11, 2024 13:28
@jm96441n jm96441n marked this pull request as ready for review July 11, 2024 17:04
@jm96441n jm96441n enabled auto-merge (squash) July 11, 2024 17:05
@jm96441n jm96441n merged commit df97d79 into release/1.5.x Jul 11, 2024
52 checks passed
@jm96441n jm96441n deleted the backport/NET-10247-add-parition-and-namespace-to-policy/pleasantly-refined-goblin branch July 11, 2024 19:31
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.

None yet

2 participants