Skip to content

Backport of NET-5389- Remove global.acls.nodeSelector and global.acls.annotations from Gateway Resources Jobs into release/1.2.x#2889

Closed
hc-github-team-consul-core wants to merge 1 commit intorelease/1.2.xfrom
backport/NET-5389/jolly-relaxed-bengal
Closed

Backport of NET-5389- Remove global.acls.nodeSelector and global.acls.annotations from Gateway Resources Jobs into release/1.2.x#2889
hc-github-team-consul-core wants to merge 1 commit intorelease/1.2.xfrom
backport/NET-5389/jolly-relaxed-bengal

Conversation

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

Backport

This PR is auto-generated from #2869 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:
@sophie-gairo
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:
Remove global.acls.nodeSelector and global.acls.annotations from the Gateway Resources Job and Gateway Cleanup Job

How I've tested this PR:

How I expect reviewers to test this PR:

Checklist:


Overview of commits

@hashicorp-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 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.

@david-yu
Copy link
Contributor

david-yu commented Sep 1, 2023

Closing in favor of #2891

@david-yu david-yu closed this Sep 1, 2023
@github-actions github-actions bot deleted the backport/NET-5389/jolly-relaxed-bengal branch September 1, 2025 06:06
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.

4 participants