From a37f632394cc85f757bde9493140b20d7ec47db2 Mon Sep 17 00:00:00 2001 From: Kevin Leimkuhler Date: Thu, 2 Feb 2023 12:58:17 -0700 Subject: [PATCH] Add block chomping and update golden files (#10244) > When using ArgoCD and Azure Key Vault Plugin to manage Linkerd via Helm, the > identityTrustAnchorsPEM value gets passed from Azure Key Vault with a trailing > new line. This trailing new line makes its way into the config map > linkerd-identity-trust-roots causing Linkerd control plane to crash upon > deployment. There aren't any other alternatives when using Azure Key Vault due > to how multi-line secrets are created. Azure forces this trailing new line. > > The solution is to add a block chomping indicator to strip trailing new lines in > the config map. > > More on block chomping indicators: https://yaml-multiline.info/ > > Fixes: #10012 The original PR #10059 has staled out, but it's worth getting this change in. Signed-off-by: Alexander Di Clemente Co-authored-by: Kevin Leimkuhler --- charts/linkerd-control-plane/templates/identity.yaml | 2 +- cli/cmd/testdata/install_controlplane_tracing_output.golden | 2 +- cli/cmd/testdata/install_custom_domain.golden | 2 +- cli/cmd/testdata/install_custom_registry.golden | 2 +- cli/cmd/testdata/install_default.golden | 2 +- cli/cmd/testdata/install_default_override_dst_get_nets.golden | 2 +- cli/cmd/testdata/install_default_token.golden | 2 +- cli/cmd/testdata/install_ha_output.golden | 2 +- cli/cmd/testdata/install_ha_with_overrides_output.golden | 2 +- cli/cmd/testdata/install_heartbeat_disabled_output.golden | 2 +- cli/cmd/testdata/install_helm_control_plane_output.golden | 2 +- cli/cmd/testdata/install_helm_control_plane_output_ha.golden | 2 +- cli/cmd/testdata/install_helm_output_ha_labels.golden | 2 +- .../testdata/install_helm_output_ha_namespace_selector.golden | 2 +- cli/cmd/testdata/install_no_init_container.golden | 2 +- cli/cmd/testdata/install_output.golden | 2 +- cli/cmd/testdata/install_proxy_ignores.golden | 2 +- cli/cmd/testdata/install_values_file.golden | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/charts/linkerd-control-plane/templates/identity.yaml b/charts/linkerd-control-plane/templates/identity.yaml index 51e915d3e..70ff355d4 100644 --- a/charts/linkerd-control-plane/templates/identity.yaml +++ b/charts/linkerd-control-plane/templates/identity.yaml @@ -34,7 +34,7 @@ metadata: annotations: {{ include "partials.annotations.created-by" . }} data: - ca-bundle.crt: |{{.Values.identityTrustAnchorsPEM | trim | nindent 4}} + ca-bundle.crt: |-{{.Values.identityTrustAnchorsPEM | trim | nindent 4}} {{- end}} --- kind: Service diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 941ba90ec..3f3038770 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index f7cc83047..d1603362a 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 989db449a..563540193 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index f7cc83047..d1603362a 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 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 e7eb08ea9..24e4bc95d 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index d6131e0f3..fd251cfc0 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 362e5d63f..3abddbe8e 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -710,7 +710,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 018fca50c..8ab9095e4 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -710,7 +710,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index e610bc88e..60003ebe6 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -605,7 +605,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index ad58dc6e2..d54503800 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -658,7 +658,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version data: - ca-bundle.crt: | + ca-bundle.crt: |- test-trust-anchor --- kind: Service diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index f9828ba6e..178635846 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -694,7 +694,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version data: - ca-bundle.crt: | + ca-bundle.crt: |- test-trust-anchor --- kind: Service diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index e2657f3e9..b95bd6ec3 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -698,7 +698,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version data: - ca-bundle.crt: | + ca-bundle.crt: |- test-trust-anchor --- kind: Service diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index 3356eeb7e..8d0cfed91 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -684,7 +684,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/helm linkerd-version data: - ca-bundle.crt: | + ca-bundle.crt: |- test-trust-anchor --- kind: Service diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 999146021..030de08a9 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 1e70ed38e..39e10f98f 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -654,7 +654,7 @@ metadata: annotations: linkerd.io/created-by: CliVersion data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 4ab91452a..213cc697a 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index debff8597..8fa673bd9 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -674,7 +674,7 @@ metadata: annotations: linkerd.io/created-by: linkerd/cli dev-undefined data: - ca-bundle.crt: | + ca-bundle.crt: |- -----BEGIN CERTIFICATE----- MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4