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

Fix yaml in linkerd-config-addons when providing grafanaUrl (#4581) 

Put back space after `grafanaUrl` label in `linkerd-config-addons.yaml`
to avoid breaking the yaml parsing.

```
$ linkerd check
...
linkerd-addons
--------------
‼ 'linkerd-config-addons' config map exists
    could not unmarshal linkerd-config-addons config-map: error
    unmarshaling JSON: while decoding JSON: json: cannot unmarshal
    string into Go struct field Values.global of type linkerd2.Global
```
This was added in #4544 to avoid having the configmap being badly formatted.

So this PR fixes the yaml, but then if we don't set `grafanaUrl` the
configmap format gets messed up, but apparently that's just a cosmetic
problem:

```
apiVersion: v1
data:
  values: "global:\n  grafanaUrl: \ngrafana:\n  enabled: true\n
  image:\n    name:
      gcr.io/linkerd-io/grafana\n  name: linkerd-grafana\n  resources:\n
      cpu:\n      limit:
          240m\n    memory:\n      limit: null\ntracing:\n  enabled:
          false"
          kind: ConfigMap
```
This commit is contained in:
Alejandro Pedraza 2020-06-09 13:08:32 -05:00 committed by GitHub
parent 37f3b10d28
commit 7a9527bf00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/linkerd2/templates/linkerd-config-addons.yaml
View File

@ -21,7 +21,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:{{.Values.global.grafanaUrl}}
grafanaUrl: "{{.Values.global.grafanaUrl}}"
grafana:
{{- include "linkerd.addons.sanitize-config" .Values.grafana}}
tracing:

2
cli/cmd/testdata/install_addon_control-plane.golden vendored
View File

@ -2010,7 +2010,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/install_control-plane.golden vendored
View File

@ -2009,7 +2009,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

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

@ -2953,7 +2953,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

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

@ -2836,7 +2836,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

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

@ -2836,7 +2836,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/install_grafana_existing.golden vendored
View File

@ -2824,7 +2824,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:somegrafana.xyz
grafanaUrl: "somegrafana.xyz"
grafana:
enabled: false
tracing:

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

@ -3085,7 +3085,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

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

@ -3085,7 +3085,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

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

@ -2747,7 +2747,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/install_helm_output.golden vendored
View File

@ -2877,7 +2877,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/install_helm_output_addons.golden vendored
View File

@ -2878,7 +2878,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/install_helm_output_ha.golden vendored
View File

@ -3126,7 +3126,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

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

@ -2569,7 +2569,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

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

@ -2828,7 +2828,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

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

@ -2836,7 +2836,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/install_restricted_dashboard.golden vendored
View File

@ -2771,7 +2771,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/install_tracing.golden vendored
View File

@ -2837,7 +2837,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/install_tracing_overwrite.golden vendored
View File

@ -2837,7 +2837,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_add-on_controlplane.golden vendored
View File

@ -2026,7 +2026,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_add-on_overwrite.golden vendored
View File

@ -2853,7 +2853,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_add_add-on.golden vendored
View File

@ -2853,7 +2853,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_default.golden vendored
View File

@ -2852,7 +2852,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_external_issuer.golden vendored
View File

@ -2838,7 +2838,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_grafana_addon_overwrite.yaml vendored
View File

@ -2852,7 +2852,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_grafana_disabled.yaml vendored
View File

@ -2839,7 +2839,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: false
tracing:

2
cli/cmd/testdata/upgrade_grafana_enabled.yaml vendored
View File

@ -2852,7 +2852,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_grafana_enabled_disabled.yaml vendored
View File

@ -2839,7 +2839,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: false
tracing:

2
cli/cmd/testdata/upgrade_grafana_overwrite.yaml vendored
View File

@ -2852,7 +2852,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_ha.golden vendored
View File

@ -3101,7 +3101,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_keep_webhook_cabundle.golden vendored
View File

@ -2852,7 +2852,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_nothing_addon.yaml vendored
View File

@ -2852,7 +2852,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_overwrite_issuer.golden vendored
View File

@ -2836,7 +2836,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_overwrite_trust_anchors-external-issuer.golden vendored
View File

@ -2822,7 +2822,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_overwrite_trust_anchors.golden vendored
View File

@ -2836,7 +2836,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image:

2
cli/cmd/testdata/upgrade_two_level_webhook_cert.golden vendored
View File

@ -2852,7 +2852,7 @@ metadata:
data:
values: |-
global:
grafanaUrl:
grafanaUrl: ""
grafana:
enabled: true
image: