diff --git a/linkerd.io/content/2.15/tasks/install-helm.md b/linkerd.io/content/2.15/tasks/install-helm.md index 0628274ef2..af0249a009 100644 --- a/linkerd.io/content/2.15/tasks/install-helm.md +++ b/linkerd.io/content/2.15/tasks/install-helm.md @@ -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 ``` @@ -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 @@ -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: @@ -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 @@ -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 Linkerd gives you observability, reliability, and securit... -linkerd/linkerd-control-plane {{% latestedge %}} Linkerd gives you observability, reliability, and securit... +NAME CHART VERSION APP VERSION DESCRIPTION +linkerd-edge/linkerd-crds Linkerd gives you observability, reliability, and securit... +linkerd-edge/linkerd-control-plane {{% latestedge %}} Linkerd gives you observability, reliability, and securit... ``` During an upgrade, you must choose whether you want to reuse the values in the @@ -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 diff --git a/linkerd.io/content/blog/2024/0606-edge-release-roundup.md b/linkerd.io/content/blog/2024/0606-edge-release-roundup.md index 8cf0425e70..45a2c5d2ef 100644 --- a/linkerd.io/content/blog/2024/0606-edge-release-roundup.md +++ b/linkerd.io/content/blog/2024/0606-edge-release-roundup.md @@ -6,7 +6,7 @@ title: |- url: /2024/06/06/linkerd-edge-release-roundup/ thumbnail: '/uploads/2023/06/roundup-clocks-square.png' -featuredImage: '/uploads/2023/06/roundup-clocks-rect.png' +featuredImage: '/uploads/2024/06/roundup-06-featured.png' tags: [Linkerd, linkerd, edge, release, roundup] featured: false --- @@ -24,8 +24,9 @@ greatest! Remember, edge releases are a snapshot of our current development work on `main`; by definition, they always have the most recent features but they may have incomplete features, features that end up getting rolled back later, or -(like all software) even bugs. That said, edge release *are* intended for production use, and go through -a rigorous set of automated and manual tests before being released. +(like all software) even bugs. That said, edge releases *are* intended for +production use, and go through a rigorous set of automated and manual tests +before being released. We would be delighted to hear how these releases work out for you! You can open [a GitHub issue](https://github.com/linkerd/linkerd2/issues/) or diff --git a/linkerd.io/package-lock.json b/linkerd.io/package-lock.json index 9108e74e90..acaca96d0f 100644 --- a/linkerd.io/package-lock.json +++ b/linkerd.io/package-lock.json @@ -1179,9 +1179,9 @@ "dev": true }, "ws": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", - "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz", + "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==", "dev": true, "requires": { "async-limiter": "~1.0.0" diff --git a/linkerd.io/static/uploads/2024/06/roundup-06-featured.png b/linkerd.io/static/uploads/2024/06/roundup-06-featured.png new file mode 100644 index 0000000000..761f5de3ae Binary files /dev/null and b/linkerd.io/static/uploads/2024/06/roundup-06-featured.png differ