From 5e367bebb99d8b6224bfb7c0bfe735da2fe1629c Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Thu, 28 Sep 2023 21:09:23 +0000 Subject: [PATCH 1/7] edge-29.9.4 This edge release makes Linkerd even better. * Added a controlPlaneVersion override to the `linkerd-control-plane` Helm chart to support including SHA256 image digests in Linkerd manifests (thanks @cromulentbanana!) ([#11406]) * Improved `linkerd viz check` to attempt to validate that the Prometheus scrape interval will work well with the CLI and Web query parameters ([#11376]) * Fixed an issue where the destination controller would not update pod metadata for profile resolutions for a pod accessed via the host network (e.g. HostPort endpoints) ([#11334]). * Added a validating webhook config for httproutes.gateway.networking.k8s.io resources (thanks @mikutas!) ([#11150]) [#11150]: https://github.com/linkerd/linkerd2/pull/11150 [#11334]: https://github.com/linkerd/linkerd2/pull/11334 [#11376]: https://github.com/linkerd/linkerd2/pull/11376 [#11406]: https://github.com/linkerd/linkerd2/pull/11406 --- CHANGES.md | 20 +++++++++++++++++++ charts/linkerd-control-plane/Chart.yaml | 2 +- charts/linkerd-control-plane/README.md | 2 +- jaeger/charts/linkerd-jaeger/Chart.yaml | 2 +- jaeger/charts/linkerd-jaeger/README.md | 2 +- .../charts/linkerd-multicluster/Chart.yaml | 2 +- .../charts/linkerd-multicluster/README.md | 2 +- viz/charts/linkerd-viz/Chart.yaml | 2 +- viz/charts/linkerd-viz/README.md | 2 +- 9 files changed, 28 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index de2c5d231ee0c..040f673722d0d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,25 @@ # Changes +## edge-29.9.4 + +This edge release makes Linkerd even better. + +* Added a controlPlaneVersion override to the `linkerd-control-plane` Helm chart + to support including SHA256 image digests in Linkerd manifests (thanks + @cromulentbanana!) ([#11406]) +* Improved `linkerd viz check` to attempt to validate that the Prometheus scrape + interval will work well with the CLI and Web query parameters ([#11376]) +* Fixed an issue where the destination controller would not update pod metadata + for profile resolutions for a pod accessed via the host network (e.g. + HostPort endpoints) ([#11334]). +* Added a validating webhook config for httproutes.gateway.networking.k8s.io + resources (thanks @mikutas!) ([#11150]) + +[#11150]: https://github.com/linkerd/linkerd2/pull/11150 +[#11334]: https://github.com/linkerd/linkerd2/pull/11334 +[#11376]: https://github.com/linkerd/linkerd2/pull/11376 +[#11406]: https://github.com/linkerd/linkerd2/pull/11406 + ## edge-29.9.3 This edge release updates the proxy's dependency on the `rustls` library to diff --git a/charts/linkerd-control-plane/Chart.yaml b/charts/linkerd-control-plane/Chart.yaml index 8c8095860eddc..0c5d0d35237cd 100644 --- a/charts/linkerd-control-plane/Chart.yaml +++ b/charts/linkerd-control-plane/Chart.yaml @@ -16,7 +16,7 @@ dependencies: - name: partials version: 0.1.0 repository: file://../partials -version: 1.17.0-edge +version: 1.17.1-edge icon: https://linkerd.io/images/logo-only-200h.png maintainers: - name: Linkerd authors diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index 58777a40ec6f8..7ac1e8924975e 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -3,7 +3,7 @@ Linkerd gives you observability, reliability, and security for your microservices — with no code change required. -![Version: 1.17.0-edge](https://img.shields.io/badge/Version-1.17.0--edge-informational?style=flat-square) +![Version: 1.17.1-edge](https://img.shields.io/badge/Version-1.17.1--edge-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square) diff --git a/jaeger/charts/linkerd-jaeger/Chart.yaml b/jaeger/charts/linkerd-jaeger/Chart.yaml index 7737d9a0bdc29..e735216c81fd7 100644 --- a/jaeger/charts/linkerd-jaeger/Chart.yaml +++ b/jaeger/charts/linkerd-jaeger/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">=1.21.0-0" name: linkerd-jaeger sources: - https://github.com/linkerd/linkerd2/ -version: 30.13.0-edge +version: 30.13.1-edge icon: https://linkerd.io/images/logo-only-200h.png maintainers: - name: Linkerd authors diff --git a/jaeger/charts/linkerd-jaeger/README.md b/jaeger/charts/linkerd-jaeger/README.md index 2e21cf30ab089..950116fdede56 100644 --- a/jaeger/charts/linkerd-jaeger/README.md +++ b/jaeger/charts/linkerd-jaeger/README.md @@ -3,7 +3,7 @@ The Linkerd-Jaeger extension adds distributed tracing to Linkerd using OpenCensus and Jaeger. -![Version: 30.13.0-edge](https://img.shields.io/badge/Version-30.13.0--edge-informational?style=flat-square) +![Version: 30.13.1-edge](https://img.shields.io/badge/Version-30.13.1--edge-informational?style=flat-square) ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square) diff --git a/multicluster/charts/linkerd-multicluster/Chart.yaml b/multicluster/charts/linkerd-multicluster/Chart.yaml index 5bbc36daaa068..1c683434de4a4 100644 --- a/multicluster/charts/linkerd-multicluster/Chart.yaml +++ b/multicluster/charts/linkerd-multicluster/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">=1.21.0-0" name: "linkerd-multicluster" sources: - https://github.com/linkerd/linkerd2/ -version: 30.11.2-edge +version: 30.11.3-edge icon: https://linkerd.io/images/logo-only-200h.png maintainers: - name: Linkerd authors diff --git a/multicluster/charts/linkerd-multicluster/README.md b/multicluster/charts/linkerd-multicluster/README.md index 2aa31b4922db8..784f649ea42f0 100644 --- a/multicluster/charts/linkerd-multicluster/README.md +++ b/multicluster/charts/linkerd-multicluster/README.md @@ -3,7 +3,7 @@ The Linkerd-Multicluster extension contains resources to support multicluster linking to remote clusters -![Version: 30.11.2-edge](https://img.shields.io/badge/Version-30.11.2--edge-informational?style=flat-square) +![Version: 30.11.3-edge](https://img.shields.io/badge/Version-30.11.3--edge-informational?style=flat-square) ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square) diff --git a/viz/charts/linkerd-viz/Chart.yaml b/viz/charts/linkerd-viz/Chart.yaml index 4bacb8f8e5ffc..b7e31d72c4a27 100644 --- a/viz/charts/linkerd-viz/Chart.yaml +++ b/viz/charts/linkerd-viz/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">=1.21.0-0" name: "linkerd-viz" sources: - https://github.com/linkerd/linkerd2/ -version: 30.12.2-edge +version: 30.12.3-edge icon: https://linkerd.io/images/logo-only-200h.png maintainers: - name: Linkerd authors diff --git a/viz/charts/linkerd-viz/README.md b/viz/charts/linkerd-viz/README.md index e5fa26a237e6c..cb9c121ff52df 100644 --- a/viz/charts/linkerd-viz/README.md +++ b/viz/charts/linkerd-viz/README.md @@ -3,7 +3,7 @@ The Linkerd-Viz extension contains observability and visualization components for Linkerd. -![Version: 30.12.2-edge](https://img.shields.io/badge/Version-30.12.2--edge-informational?style=flat-square) +![Version: 30.12.3-edge](https://img.shields.io/badge/Version-30.12.3--edge-informational?style=flat-square) ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square) From 2f881d74f4bb9606a2942f0e8d35ac44ca63f72e Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Thu, 28 Sep 2023 21:24:33 +0000 Subject: [PATCH 2/7] +11377 --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 040f673722d0d..083da4ddb3be9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,8 @@ This edge release makes Linkerd even better. @cromulentbanana!) ([#11406]) * Improved `linkerd viz check` to attempt to validate that the Prometheus scrape interval will work well with the CLI and Web query parameters ([#11376]) +* Improved CLI error handling to print differentiated error information when + versioncheck.linkerd.io cannot be resolved (thanks @dtaskai) ([#11377]) * Fixed an issue where the destination controller would not update pod metadata for profile resolutions for a pod accessed via the host network (e.g. HostPort endpoints) ([#11334]). From 2ef18117c03f86d9492bf2018aaedf343b2bd27e Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Thu, 28 Sep 2023 21:38:30 +0000 Subject: [PATCH 3/7] fix link --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 083da4ddb3be9..74dc5107fdcfa 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,6 +20,7 @@ This edge release makes Linkerd even better. [#11150]: https://github.com/linkerd/linkerd2/pull/11150 [#11334]: https://github.com/linkerd/linkerd2/pull/11334 [#11376]: https://github.com/linkerd/linkerd2/pull/11376 +[#11377]: https://github.com/linkerd/linkerd2/pull/11377 [#11406]: https://github.com/linkerd/linkerd2/pull/11406 ## edge-29.9.3 From ab9c7f26beeaa4895b2b1e074316a84d2a6fdcf9 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Fri, 29 Sep 2023 00:30:48 +0000 Subject: [PATCH 4/7] multicluster check --timeout --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 74dc5107fdcfa..81a952603992f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,12 +16,15 @@ This edge release makes Linkerd even better. HostPort endpoints) ([#11334]). * Added a validating webhook config for httproutes.gateway.networking.k8s.io resources (thanks @mikutas!) ([#11150]) +* Introduced a new `multicluster check --timeout` flag to limit the time + allowed for Kubernetes API calls (thanks @moki1202) ([#11420]) [#11150]: https://github.com/linkerd/linkerd2/pull/11150 [#11334]: https://github.com/linkerd/linkerd2/pull/11334 [#11376]: https://github.com/linkerd/linkerd2/pull/11376 [#11377]: https://github.com/linkerd/linkerd2/pull/11377 [#11406]: https://github.com/linkerd/linkerd2/pull/11406 +[#11420]: https://github.com/linkerd/linkerd2/pull/11420 ## edge-29.9.3 From 5744af23b941ad192bc9c7d4bdb3bbd278f4199c Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Fri, 29 Sep 2023 00:34:17 +0000 Subject: [PATCH 5/7] fix helm chart versions --- charts/linkerd2-cni/Chart.yaml | 2 +- multicluster/charts/linkerd-multicluster/Chart.yaml | 2 +- viz/charts/linkerd-viz/Chart.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/linkerd2-cni/Chart.yaml b/charts/linkerd2-cni/Chart.yaml index 8f05343b6daff..08c0a5276e280 100644 --- a/charts/linkerd2-cni/Chart.yaml +++ b/charts/linkerd2-cni/Chart.yaml @@ -9,4 +9,4 @@ description: | kubeVersion: ">=1.21.0-0" icon: https://linkerd.io/images/logo-only-200h.png name: "linkerd2-cni" -version: 30.12.1-edge +version: 30.13.0-edge diff --git a/multicluster/charts/linkerd-multicluster/Chart.yaml b/multicluster/charts/linkerd-multicluster/Chart.yaml index 1c683434de4a4..3222b98213e77 100644 --- a/multicluster/charts/linkerd-multicluster/Chart.yaml +++ b/multicluster/charts/linkerd-multicluster/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">=1.21.0-0" name: "linkerd-multicluster" sources: - https://github.com/linkerd/linkerd2/ -version: 30.11.3-edge +version: 30.12.0-edge icon: https://linkerd.io/images/logo-only-200h.png maintainers: - name: Linkerd authors diff --git a/viz/charts/linkerd-viz/Chart.yaml b/viz/charts/linkerd-viz/Chart.yaml index b7e31d72c4a27..ff5e8063598fb 100644 --- a/viz/charts/linkerd-viz/Chart.yaml +++ b/viz/charts/linkerd-viz/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">=1.21.0-0" name: "linkerd-viz" sources: - https://github.com/linkerd/linkerd2/ -version: 30.12.3-edge +version: 30.13.0-edge icon: https://linkerd.io/images/logo-only-200h.png maintainers: - name: Linkerd authors From dd2868d5ac242fd9e8883a3d8839dde1aa377e25 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Fri, 29 Sep 2023 00:36:01 +0000 Subject: [PATCH 6/7] docs --- charts/linkerd2-cni/README.md | 2 +- multicluster/charts/linkerd-multicluster/README.md | 2 +- viz/charts/linkerd-viz/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/linkerd2-cni/README.md b/charts/linkerd2-cni/README.md index 3853cd792f9ec..5c782065f6d4c 100644 --- a/charts/linkerd2-cni/README.md +++ b/charts/linkerd2-cni/README.md @@ -6,7 +6,7 @@ Linkerd [CNI plugin](https://linkerd.io/2/features/cni/) takes care of setting up your pod's network so incoming and outgoing traffic is proxied through the data plane. -![Version: 30.12.1-edge](https://img.shields.io/badge/Version-30.12.1--edge-informational?style=flat-square) +![Version: 30.13.0-edge](https://img.shields.io/badge/Version-30.13.0--edge-informational?style=flat-square) ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square) diff --git a/multicluster/charts/linkerd-multicluster/README.md b/multicluster/charts/linkerd-multicluster/README.md index 784f649ea42f0..88e570debeb7b 100644 --- a/multicluster/charts/linkerd-multicluster/README.md +++ b/multicluster/charts/linkerd-multicluster/README.md @@ -3,7 +3,7 @@ The Linkerd-Multicluster extension contains resources to support multicluster linking to remote clusters -![Version: 30.11.3-edge](https://img.shields.io/badge/Version-30.11.3--edge-informational?style=flat-square) +![Version: 30.12.0-edge](https://img.shields.io/badge/Version-30.12.0--edge-informational?style=flat-square) ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square) diff --git a/viz/charts/linkerd-viz/README.md b/viz/charts/linkerd-viz/README.md index cb9c121ff52df..a64b54969b7e5 100644 --- a/viz/charts/linkerd-viz/README.md +++ b/viz/charts/linkerd-viz/README.md @@ -3,7 +3,7 @@ The Linkerd-Viz extension contains observability and visualization components for Linkerd. -![Version: 30.12.3-edge](https://img.shields.io/badge/Version-30.12.3--edge-informational?style=flat-square) +![Version: 30.13.0-edge](https://img.shields.io/badge/Version-30.13.0--edge-informational?style=flat-square) ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square) From 18dc5f68db0c7807dc5728988efd07e2410a9534 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Fri, 29 Sep 2023 00:38:01 +0000 Subject: [PATCH 7/7] fix versions --- CHANGES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 81a952603992f..0ea4be336d4dc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## edge-29.9.4 +## edge-23.9.4 This edge release makes Linkerd even better. @@ -26,7 +26,7 @@ This edge release makes Linkerd even better. [#11406]: https://github.com/linkerd/linkerd2/pull/11406 [#11420]: https://github.com/linkerd/linkerd2/pull/11420 -## edge-29.9.3 +## edge-23.9.3 This edge release updates the proxy's dependency on the `rustls` library to patch security vulnerability [RUSTSEC-2023-0052][RUSTSEC-2023-0052-0] @@ -52,7 +52,7 @@ control plane and jaeger extension Helm charts. [#11342]: https://github.com/linkerd/linkerd2/issues/11342 [RUSTSEC-2023-0052-0]: https://rustsec.org/advisories/RUSTSEC-2023-0052.html -## edge-29.9.2 +## edge-23.9.2 This edge release updates the proxy's dependency on the `webpki` library to patch security vulnerability [RUSTSEC-2023-0052] (GHSA-8qv2-5vq6-g2g7), a