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 jobspec: update gateway.ingress.service Consul API fields into release/1.7.x #20194

Conversation

hc-github-team-nomad-core
Copy link
Contributor

Backport

This PR is auto-generated from #20176 to be assessed for backporting due to the inclusion of the label backport/1.7.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:
@tgross
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/nomad/merges: 409 Merge conflict []

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


Add support for further configuring gateway.ingress.service blocks to bring this block up-to-date with currently available Consul API fields (except for namespace and admin partition, which will need be handled under a different PR). These fields are sent to Consul as part of the job endpoint submission hook for Connect gatways.

Replaces #16753, which I've rebased on main and added another commit that addresses a variety of documentation and style issues.

Docs preview: https://nomad-32oz91834-hashicorp.vercel.app/nomad/docs/job-specification/gateway


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Mar 22, 2024

CLA assistant check
All committers have signed the CLA.

Add support for further configuring `gateway.ingress.service` blocks to bring
this block up-to-date with currently available Consul API fields (except for
namespace and admin partition, which will need be handled under a different
PR). These fields are sent to Consul as part of the job endpoint submission hook
for Connect gateways.

Co-authored-by: Horacio Monsalvo <horacio.monsalvo@southworks.com>
@tgross tgross force-pushed the backport/CONSUL-681-consulIngressService-updated/firmly-fancy-bonefish branch from 50ea6bb to 5b0ce3b Compare March 22, 2024 17:52
@tgross tgross marked this pull request as ready for review March 22, 2024 17:52
@tgross tgross merged commit 25b268a into release/1.7.x Mar 22, 2024
18 of 20 checks passed
@tgross tgross deleted the backport/CONSUL-681-consulIngressService-updated/firmly-fancy-bonefish branch March 22, 2024 18:19
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.

3 participants