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 feat: adding security context and annotations to tls and acl init/cleanup jobs into release/1.0.x #2529

Conversation

hc-github-team-consul-core

Backport

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


Duplicate of #2508.

Adds Security Context and Annotations to TLS and ACL cleanup and init jobs.

Closes #1433 #670


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/tls-n-acl-security-context/separately-solid-yak branch 2 times, most recently from c2ec45b to a30fc64 Compare July 10, 2023 17:57
@hashicorp-cla
Copy link

hashicorp-cla commented Jul 10, 2023

CLA assistant check
All committers have signed the CLA.

@DanStough DanStough force-pushed the backport/dans/tls-n-acl-security-context/separately-solid-yak branch from b5d52c9 to 69af648 Compare July 10, 2023 18:07
@DanStough DanStough marked this pull request as ready for review July 10, 2023 18:07
@DanStough DanStough merged commit 11f8597 into release/1.0.x Jul 10, 2023
3 checks passed
@DanStough DanStough deleted the backport/dans/tls-n-acl-security-context/separately-solid-yak branch July 10, 2023 19:59
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