linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <diclemea@gmail.com>
Co-authored-by: Kevin Leimkuhler <kleimkuhler@icloud.com>
This commit is contained in:
Kevin Leimkuhler 2023-02-02 12:58:17 -07:00 committed by GitHub
parent a1214c3fc8
commit a37f632394
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/linkerd-control-plane/templates/identity.yaml
View File

@ -34,7 +34,7 @@ metadata:
annotations: annotations:
{{ include "partials.annotations.created-by" . }} {{ include "partials.annotations.created-by" . }}
data: data:
ca-bundle.crt: |{{.Values.identityTrustAnchorsPEM | trim | nindent 4}} ca-bundle.crt: |-{{.Values.identityTrustAnchorsPEM | trim | nindent 4}}
{{- end}} {{- end}}
--- ---
kind: Service kind: Service

2
cli/cmd/testdata/install_controlplane_tracing_output.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_custom_domain.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_custom_registry.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_default.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_default_override_dst_get_nets.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_default_token.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_ha_output.golden generated vendored
View File

@ -710,7 +710,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_ha_with_overrides_output.golden generated vendored
View File

@ -710,7 +710,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_heartbeat_disabled_output.golden generated vendored
View File

@ -605,7 +605,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_helm_control_plane_output.golden generated vendored
View File

@ -658,7 +658,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/created-by: linkerd/helm linkerd-version
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
test-trust-anchor test-trust-anchor
--- ---
kind: Service kind: Service

2
cli/cmd/testdata/install_helm_control_plane_output_ha.golden generated vendored
View File

@ -694,7 +694,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/created-by: linkerd/helm linkerd-version
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
test-trust-anchor test-trust-anchor
--- ---
kind: Service kind: Service

2
cli/cmd/testdata/install_helm_output_ha_labels.golden generated vendored
View File

@ -698,7 +698,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/created-by: linkerd/helm linkerd-version
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
test-trust-anchor test-trust-anchor
--- ---
kind: Service kind: Service

2
cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden generated vendored
View File

@ -684,7 +684,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/created-by: linkerd/helm linkerd-version
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
test-trust-anchor test-trust-anchor
--- ---
kind: Service kind: Service

2
cli/cmd/testdata/install_no_init_container.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_output.golden generated vendored
View File

@ -654,7 +654,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: CliVersion linkerd.io/created-by: CliVersion
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_proxy_ignores.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4

2
cli/cmd/testdata/install_values_file.golden generated vendored
View File

@ -674,7 +674,7 @@ metadata:
annotations: annotations:
linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/created-by: linkerd/cli dev-undefined
data: data:
ca-bundle.crt: | ca-bundle.crt: |-
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw MIIBwTCCAWagAwIBAgIQeDZp5lDaIygQ5UfMKZrFATAKBggqhkjOPQQDAjApMScw
JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4 JQYDVQQDEx5pZGVudGl0eS5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjAwODI4