-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
docs: connect-service-upstreams annotation fixes #17312
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left a few minor suggestions that you can take or leave. BTW, I think this is OK for now, but we will probably want to replace this information with links to the appropriate DNS section for when we finish reorganizing that content so that we aren't embedding usage information into the reference.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @boruszak,
Thanks for cleaning this up! It's much easier to follow now. I have a few suggestions to enhance accuracy and steer people towards the labeled format.
'consul.hashicorp.com/connect-service-upstreams': 'prepared_query:[query name]:[port]' | ||
``` | ||
|
||
- **Labeled** (requires Consul for Kubernetes v0.45.0+): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move this above the Unlabeled section
My understanding is that upstream annotations have nothing to do with Consul DNS, though there are similarities in the syntax between labeled annotations and Consul DNS lookup suffixes. So I don't think there's a need to revisit this content after the DNS docs updates are made. |
Co-authored-by: Jared Kirschner <[email protected]>
Co-authored-by: Jared Kirschner <[email protected]>
Co-authored-by: Jared Kirschner <[email protected]>
Co-authored-by: Jared Kirschner <[email protected]>
Co-authored-by: Jared Kirschner <[email protected]>
Co-authored-by: trujillo-adam <[email protected]>
@jkirschner-hashicorp: your comment was in a conversation that I resolved, but I wanted to address it explicitly as well: Adam and I just discussed how we treat versions with versioned docs, and whether we want to change references as we find them or wait until we can address the pages as a whole. There's still some questions to resolve around how we reference versions, so for the sake of tracking work and technical accuracy, we're going to leave references to previous versions (esp. reference to versions older than v1.8, which aren't selectable for versioned docs) and address them at a later point. |
Co-authored-by: Jared Kirschner <[email protected]>
Co-authored-by: Jared Kirschner <[email protected]>
* corrections * fixes * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: trujillo-adam <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Switching order of labeled/unlabeled --------- Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]>
* corrections * fixes * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: trujillo-adam <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Switching order of labeled/unlabeled --------- Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]>
…ease/1.14.x (#17337) * no-op commit due to failed cherry-picking * docs: connect-service-upstreams annotation fixes (#17312) * corrections * fixes * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: trujillo-adam <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Switching order of labeled/unlabeled --------- Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]> --------- Co-authored-by: temp <[email protected]> Co-authored-by: Jeff Boruszak <[email protected]> Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]>
…ease/1.15.x (#17338) * no-op commit due to failed cherry-picking * docs: connect-service-upstreams annotation fixes (#17312) * corrections * fixes * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: trujillo-adam <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Switching order of labeled/unlabeled --------- Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]> --------- Co-authored-by: temp <[email protected]> Co-authored-by: Jeff Boruszak <[email protected]> Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]>
* no-op commit due to failed cherry-picking * docs: connect-service-upstreams annotation fixes (#17312) * corrections * fixes * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: trujillo-adam <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Switching order of labeled/unlabeled --------- Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]> * Git Head fixes --------- Co-authored-by: temp <[email protected]> Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]>
* no-op commit due to failed cherry-picking * docs: connect-service-upstreams annotation fixes (#17312) * corrections * fixes * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: trujillo-adam <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Update website/content/docs/k8s/annotations-and-labels.mdx Co-authored-by: Jared Kirschner <[email protected]> * Switching order of labeled/unlabeled --------- Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]> * Fix merge conflict --------- Co-authored-by: temp <[email protected]> Co-authored-by: Jared Kirschner <[email protected]> Co-authored-by: trujillo-adam <[email protected]>
Description
Several issues in the description for using the
consul.hashicorp.com/connect-service-upstreams
annotation were creating confusion. These issues included broken links, unexplained terms, and incorectly formatted nested lists.These edits add clarity to the description, and are especially invested in making it easier to locate syntax for formatting services when using cluster peering.
Links
Direct link to content in deployment preview
PR Checklist