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

Fix helm install instructions #1790

Merged
merged 1 commit into from
Jun 20, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions linkerd.io/content/2.15/tasks/install-helm.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ page. {{< /note >}}
The `linkerd-crds` chart sets up the CRDs linkerd requires:

```bash
helm install linkerd-crds linkerd/linkerd-crds \
helm install linkerd-crds linkerd-edge/linkerd-crds \
-n linkerd --create-namespace
```

Expand All @@ -62,7 +62,7 @@ helm install linkerd-control-plane \
--set-file identityTrustAnchorsPEM=ca.crt \
--set-file identity.issuer.tls.crtPEM=issuer.crt \
--set-file identity.issuer.tls.keyPEM=issuer.key \
linkerd/linkerd-control-plane
linkerd-edge/linkerd-control-plane
```

{{< note >}} If you are using [Linkerd's CNI plugin](../../features/cni/), you
Expand All @@ -80,7 +80,7 @@ specified in those files.
You can get `values-ha.yaml` by fetching the chart file:

```bash
helm fetch --untar linkerd/linkerd-control-plane
helm fetch --untar linkerd-edge/linkerd-control-plane
```

Then use the `-f` flag to provide this override file. For example:
Expand All @@ -92,7 +92,7 @@ helm install linkerd-control-plane \
--set-file identity.issuer.tls.crtPEM=issuer.crt \
--set-file identity.issuer.tls.keyPEM=issuer.key \
-f linkerd-control-plane/values-ha.yaml \
linkerd/linkerd-control-plane
linkerd-edge/linkerd-control-plane
```

## Upgrading with Helm
Expand All @@ -103,9 +103,9 @@ First, make sure your local Helm repos are updated:
helm repo update

helm search repo linkerd
NAME CHART VERSION APP VERSION DESCRIPTION
linkerd/linkerd-crds <chart-semver-version> Linkerd gives you observability, reliability, and securit...
linkerd/linkerd-control-plane <chart-semver-version> {{% latestedge %}} Linkerd gives you observability, reliability, and securit...
NAME CHART VERSION APP VERSION DESCRIPTION
linkerd-edge/linkerd-crds <chart-semver-version> Linkerd gives you observability, reliability, and securit...
linkerd-edge/linkerd-control-plane <chart-semver-version> {{% latestedge %}} Linkerd gives you observability, reliability, and securit...
```

During an upgrade, you must choose whether you want to reuse the values in the
Expand Down Expand Up @@ -136,10 +136,10 @@ your `values.yaml` file. Then you can use:

```bash
# the linkerd-crds chart currently doesn't have a values.yaml file
helm upgrade linkerd-crds linkerd/linkerd-crds
helm upgrade linkerd-crds linkerd-edge/linkerd-crds

# whereas linkerd-control-plane does
helm upgrade linkerd-control-plane linkerd/linkerd-control-plane --reset-values -f values.yaml --atomic
helm upgrade linkerd-control-plane linkerd-edge/linkerd-control-plane --reset-values -f values.yaml --atomic
```

The `--atomic` flag will ensure that all changes are rolled back in case the
Expand Down
Loading