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.

Sign up for GitHub

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

Jump to bottom

Backport of docs: connect-service-upstreams annotation fixes into release/1.15.x #17338

Merged
merged 4 commits into from
May 17, 2023
Merged

Backport of docs: connect-service-upstreams annotation fixes into release/1.15.x #17338

merged 4 commits into from
May 17, 2023

Commits on May 12, 2023

  1. no-op commit due to failed cherry-picking

    temp committed May 12, 2023
    Configuration menu
    Copy the full SHA
    c93e830 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. docs: connect-service-upstreams annotation fixes (#17312) 

    * corrections

* fixes

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>

* Switching order of labeled/unlabeled

---------

Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
    @boruszak @jkirschner-hashicorp @trujillo-adam
    3 people committed May 17, 2023
    Configuration menu
    Copy the full SHA
    441f698 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/1.15.x' into backport/docs/annotations-page-str… 

    …ucture-fixes/vastly-pretty-fox
    @boruszak
    boruszak authored May 17, 2023
    Configuration menu
    Copy the full SHA
    8f0a1e3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release/1.15.x' into backport/docs/annotations-page-str… 

    …ucture-fixes/vastly-pretty-fox
    @boruszak
    boruszak authored May 17, 2023
    Configuration menu
    Copy the full SHA
    a2f63bb View commit details
    Browse the repository at this point in the history