From 726e88ea03faf2c8b4c903723b5fa633ca8aec17 Mon Sep 17 00:00:00 2001 From: Margo Crawford Date: Fri, 21 Jan 2022 10:26:45 -0800 Subject: [PATCH] When instructing users how to install the concierge with kubectl apply, reccommend using install-pinniped-concierge-crds.yaml, then install-pinniped-concierge-resources.yaml. Previously we recommended install-pinniped-concierge-crds (a subset), then install-pinniped-concierge (everything concierge related, including the crds). This works fine for install, but not uninstall. Instead we should use a separate yaml file that contains everything in install-pinniped-concierge but *not* in install-pinniped-concierge-crds. We have been generating this file in CI since a5ced4286b6febc7474b7adee34eeb1b62ec82b7 but we haven't released since then so we haven't been able to recommend its use. --- site/content/docs/howto/install-concierge.md | 2 +- site/content/docs/tutorials/concierge-and-supervisor-demo.md | 4 ++-- site/content/docs/tutorials/concierge-only-demo.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/content/docs/howto/install-concierge.md b/site/content/docs/howto/install-concierge.md index b6ad47e7..570dd1d3 100644 --- a/site/content/docs/howto/install-concierge.md +++ b/site/content/docs/howto/install-concierge.md @@ -36,7 +36,7 @@ If you'd prefer to customize the annotations or load balancer IP address, see th 1. Install the latest version of the Concierge into the `pinniped-concierge` namespace with default options: - - `kubectl apply -f https://get.pinniped.dev/{{< latestversion >}}/install-pinniped-concierge.yaml` + - `kubectl apply -f https://get.pinniped.dev/{{< latestversion >}}/install-pinniped-concierge-resources.yaml` ## With custom options diff --git a/site/content/docs/tutorials/concierge-and-supervisor-demo.md b/site/content/docs/tutorials/concierge-and-supervisor-demo.md index 8dcda1f5..16e941d4 100644 --- a/site/content/docs/tutorials/concierge-and-supervisor-demo.md +++ b/site/content/docs/tutorials/concierge-and-supervisor-demo.md @@ -147,13 +147,13 @@ to authenticate federated identities from the Supervisor. kubectl apply --context kind-pinniped-concierge \ -f https://get.pinniped.dev/{{< latestversion >}}/install-pinniped-concierge-crds.yaml kubectl apply --context kind-pinniped-concierge \ - -f https://get.pinniped.dev/{{< latestversion >}}/install-pinniped-concierge.yaml + -f https://get.pinniped.dev/{{< latestversion >}}/install-pinniped-concierge-resources.yaml ``` The `install-pinniped-concierge-crds.yaml` file contains the Concierge CustomResourceDefinitions. These define the custom APIs that you use to configure and interact with the Concierge. - The `install-pinniped-concierge.yaml` file includes the rest of the Concierge resources with default deployment options. + The `install-pinniped-concierge-resources.yaml` file includes the rest of the Concierge resources with default deployment options. If you would prefer to customize the available options, please see the [Concierge installation guide]({{< ref "../howto/install-concierge" >}}) for instructions on how to deploy using `ytt`. diff --git a/site/content/docs/tutorials/concierge-only-demo.md b/site/content/docs/tutorials/concierge-only-demo.md index de8eb88e..e6adfd49 100644 --- a/site/content/docs/tutorials/concierge-only-demo.md +++ b/site/content/docs/tutorials/concierge-only-demo.md @@ -100,13 +100,13 @@ as the authenticator. ```sh kubectl apply -f https://get.pinniped.dev/{{< latestversion >}}/install-pinniped-concierge-crds.yaml - kubectl apply -f https://get.pinniped.dev/{{< latestversion >}}/install-pinniped-concierge.yaml + kubectl apply -f https://get.pinniped.dev/{{< latestversion >}}/install-pinniped-concierge-resources.yaml ``` The `install-pinniped-concierge-crds.yaml` file contains the Concierge CustomResourceDefinitions. These define the custom APIs that you use to configure and interact with the Concierge. - The `install-pinniped-concierge.yaml` file includes the rest of the Concierge resources with default deployment options. + The `install-pinniped-concierge-resources.yaml` file includes the rest of the Concierge resources with default deployment options. If you would prefer to customize the available options, please see the [Concierge installation guide]({{< ref "../howto/install-concierge" >}}) for instructions on how to deploy using `ytt`.