From 7cc8be2f1b95feb8f11db8ef407a5b3f65a1df0e Mon Sep 17 00:00:00 2001 From: Kevin Leimkuhler Date: Thu, 3 Feb 2022 15:13:36 -0700 Subject: [PATCH] Add changes for edge-22.2.1 (#7779) ## edge-22.2.1 This edge release removed the `disableIdentity` configuration now that the proxy no longer supports running without identity. * Added a `privileged` configuration to linkerd-cni which is required by some environments * Fixed an issue where the TLS credentials used by the policy validator were not updated when the credentials were rotated * Removed the `disableIdentity` configurations now that the proxy no longer supports running without identity * Fixed an issue where `linkerd jaeger check` would needlessly fail for BYO Jaeger or collector installations * Fixed a Helm HA installation race condition introduced by the stoppage of namespace creation Signed-off-by: Kevin Leimkuhler --- CHANGES.md | 16 ++++++++++++++++ charts/linkerd-control-plane/Chart.yaml | 4 ++-- charts/linkerd-control-plane/README.md | 2 +- charts/linkerd2-cni/Chart.yaml | 2 +- charts/linkerd2-cni/README.md | 2 +- .../install_controlplane_tracing_output.golden | 6 +++--- cli/cmd/testdata/install_custom_domain.golden | 6 +++--- cli/cmd/testdata/install_custom_registry.golden | 6 +++--- cli/cmd/testdata/install_default.golden | 6 +++--- .../install_default_override_dst_get_nets.golden | 6 +++--- cli/cmd/testdata/install_default_token.golden | 6 +++--- cli/cmd/testdata/install_ha_output.golden | 6 +++--- .../install_ha_with_overrides_output.golden | 6 +++--- .../install_heartbeat_disabled_output.golden | 6 +++--- .../testdata/install_no_init_container.golden | 6 +++--- cli/cmd/testdata/install_output.golden | 6 +++--- cli/cmd/testdata/install_proxy_ignores.golden | 6 +++--- cli/cmd/testdata/install_values_file.golden | 6 +++--- 18 files changed, 60 insertions(+), 44 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e1fcb32a4..214e7df7e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,21 @@ # Changes +## edge-22.2.1 + +This edge release removed the `disableIdentity` configuration now that the proxy +no longer supports running without identity. + +* Added a `privileged` configuration to linkerd-cni which is required by some + environments +* Fixed an issue where the TLS credentials used by the policy validator were not + updated when the credentials were rotated +* Removed the `disableIdentity` configurations now that the proxy no longer + supports running without identity +* Fixed an issue where `linkerd jaeger check` would needlessly fail for BYO + Jaeger or collector installations +* Fixed a Helm HA installation race condition introduced by the stoppage of + namespace creation + ## edge-22.1.5 This edge release adds support for per-request Access Logging for HTTP inbound diff --git a/charts/linkerd-control-plane/Chart.yaml b/charts/linkerd-control-plane/Chart.yaml index 35ec4bccf..2772e3a27 100644 --- a/charts/linkerd-control-plane/Chart.yaml +++ b/charts/linkerd-control-plane/Chart.yaml @@ -12,11 +12,11 @@ kubeVersion: ">=1.20.0-0" name: "linkerd-control-plane" sources: - https://github.com/linkerd/linkerd2/ -dependencies: +dependencies: - name: partials version: 0.1.0 repository: file://../partials -version: 1.1.3-edge +version: 1.1.4-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 975b5f96b..f3a89308c 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.1.3-edge](https://img.shields.io/badge/Version-1.1.3--edge-informational?style=flat-square) +![Version: 1.1.4-edge](https://img.shields.io/badge/Version-1.1.4--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/linkerd2-cni/Chart.yaml b/charts/linkerd2-cni/Chart.yaml index 8522d8fcb..6be65789d 100644 --- a/charts/linkerd2-cni/Chart.yaml +++ b/charts/linkerd2-cni/Chart.yaml @@ -9,5 +9,5 @@ description: | kubeVersion: ">=1.20.0-0" icon: https://linkerd.io/images/logo-only-200h.png name: "linkerd2-cni" -version: 30.0.3-edge +version: 30.0.4-edge diff --git a/charts/linkerd2-cni/README.md b/charts/linkerd2-cni/README.md index 5c3c88054..7c6281cbc 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.0.3-edge](https://img.shields.io/badge/Version-30.0.3--edge-informational?style=flat-square) +![Version: 30.0.4-edge](https://img.shields.io/badge/Version-30.0.4--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/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 62b8f90cc..8d4020b2d 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index 3b8571fd0..8cfbc5940 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 724dd4433..fc152570d 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 3b8571fd0..8cfbc5940 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 1d10f56aa..3c2b84a79 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index 7998695d2..1d87c9632 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index f47aa254d..091adcc06 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index ee8bed99a..38cfe3130 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 6575e4ef2..9d2a22521 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index fd6daeea0..97dc26442 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 3ac30a276..be9a12aa2 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: CliVersion labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: CliVersion labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: CliVersion labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 2c35c0a81..a0de072cc 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index 064e0859d..dcdba479d 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -6,7 +6,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -152,7 +152,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io @@ -441,7 +441,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined labels: - helm.sh/chart: linkerd-control-plane-1.1.3-edge + helm.sh/chart: linkerd-control-plane-1.1.4-edge linkerd.io/control-plane-ns: linkerd spec: group: linkerd.io