From f0d861ea9b927eed308d66fa64a08a5861c028d2 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 20 Feb 2024 11:47:59 -0800 Subject: [PATCH] edge-24.2.4 (#12113) Updated the ExternalWorkload CRD to v1beta1, renaming the meshTls field to meshTLS ([#12098]) * Updated the proxy to address some logging and metrics inconsistencies ([#12099]) --- CHANGES.md | 10 ++++++++++ charts/linkerd-control-plane/Chart.yaml | 2 +- charts/linkerd-control-plane/README.md | 2 +- charts/linkerd-crds/Chart.yaml | 2 +- charts/linkerd-crds/README.md | 2 +- cli/cmd/testdata/install_crds.golden | 18 +++++++++--------- 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 +- 12 files changed, 29 insertions(+), 19 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 3d968e92b..25e945ecc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,15 @@ # Changes +## edge-24.2.4 + +* Updated the ExternalWorkload CRD to v1beta1, renaming the meshTls field to + meshTLS ([#12098]) +* Updated the proxy to address some logging and metrics inconsistencies + ([#12099]) + +[#12098]: https://github.com/linkerd/linkerd2/pull/12098 +[#12099]: https://github.com/linkerd/linkerd2/pull/12099 + ## edge-24.2.3 * Allowed the `MutatingWebhookConfig` timeout value to be configured ([#12028]) diff --git a/charts/linkerd-control-plane/Chart.yaml b/charts/linkerd-control-plane/Chart.yaml index 1ec734ac1..adc48a9e3 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.18.9-edge +version: 1.18.10-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 90d6203dc..60bc15766 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.18.9-edge](https://img.shields.io/badge/Version-1.18.9--edge-informational?style=flat-square) +![Version: 1.18.10-edge](https://img.shields.io/badge/Version-1.18.10--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/charts/linkerd-crds/Chart.yaml b/charts/linkerd-crds/Chart.yaml index 048c04a4f..eeae0628b 100644 --- a/charts/linkerd-crds/Chart.yaml +++ b/charts/linkerd-crds/Chart.yaml @@ -14,7 +14,7 @@ dependencies: - name: partials version: 0.1.0 repository: file://../partials -version: 1.9.3-edge +version: 1.9.4-edge icon: https://linkerd.io/images/logo-only-200h.png maintainers: - name: Linkerd authors diff --git a/charts/linkerd-crds/README.md b/charts/linkerd-crds/README.md index 73255bc61..4910c40f8 100644 --- a/charts/linkerd-crds/README.md +++ b/charts/linkerd-crds/README.md @@ -3,7 +3,7 @@ Linkerd gives you observability, reliability, and security for your microservices — with no code change required. -![Version: 1.9.3-edge](https://img.shields.io/badge/Version-1.9.3--edge-informational?style=flat-square) +![Version: 1.9.4-edge](https://img.shields.io/badge/Version-1.9.4--edge-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) **Homepage:** diff --git a/cli/cmd/testdata/install_crds.golden b/cli/cmd/testdata/install_crds.golden index 3b68a30f4..8636c9702 100644 --- a/cli/cmd/testdata/install_crds.golden +++ b/cli/cmd/testdata/install_crds.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -105,7 +105,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -5321,7 +5321,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -5408,7 +5408,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -5461,7 +5461,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -5727,7 +5727,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -5952,7 +5952,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io @@ -6226,7 +6226,7 @@ metadata: gateway.networking.k8s.io/channel: experimental linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd creationTimestamp: null name: httproutes.gateway.networking.k8s.io @@ -10234,7 +10234,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-crds-1.9.3-edge + helm.sh/chart: linkerd-crds-1.9.4-edge linkerd.io/control-plane-ns: linkerd spec: group: workload.linkerd.io diff --git a/jaeger/charts/linkerd-jaeger/Chart.yaml b/jaeger/charts/linkerd-jaeger/Chart.yaml index e0531e2f5..5c2aed876 100644 --- a/jaeger/charts/linkerd-jaeger/Chart.yaml +++ b/jaeger/charts/linkerd-jaeger/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">=1.22.0-0" name: linkerd-jaeger sources: - https://github.com/linkerd/linkerd2/ -version: 30.14.9-edge +version: 30.14.10-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 e83c334e6..88f138796 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.14.9-edge](https://img.shields.io/badge/Version-30.14.9--edge-informational?style=flat-square) +![Version: 30.14.10-edge](https://img.shields.io/badge/Version-30.14.10--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 67d2b257b..82437859e 100644 --- a/multicluster/charts/linkerd-multicluster/Chart.yaml +++ b/multicluster/charts/linkerd-multicluster/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">=1.22.0-0" name: "linkerd-multicluster" sources: - https://github.com/linkerd/linkerd2/ -version: 30.12.18-edge +version: 30.12.19-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 d9f2ec92a..34a90df08 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.12.18-edge](https://img.shields.io/badge/Version-30.12.18--edge-informational?style=flat-square) +![Version: 30.12.19-edge](https://img.shields.io/badge/Version-30.12.19--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 4e3407a59..77cb32efb 100644 --- a/viz/charts/linkerd-viz/Chart.yaml +++ b/viz/charts/linkerd-viz/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">=1.22.0-0" name: "linkerd-viz" sources: - https://github.com/linkerd/linkerd2/ -version: 30.14.9-edge +version: 30.14.10-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 dd668fdad..61db5318a 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.14.9-edge](https://img.shields.io/badge/Version-30.14.9--edge-informational?style=flat-square) +![Version: 30.14.10-edge](https://img.shields.io/badge/Version-30.14.10--edge-informational?style=flat-square) ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)