linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linkerd2/cli/cmd
History
Alejandro Pedraza 7a9527bf00
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
```
 		2020-06-09 11:08:32 -07:00
..
testdata Fix yaml in linkerd-config-addons when providing grafanaUrl (#4581) 2020-06-09 11:08:32 -07:00
alpha.go Added documentation for alpha cli command (#4412) 2020-05-26 13:59:56 -07:00
alpha_clients.go Added documentation for alpha cli command (#4412) 2020-05-26 13:59:56 -07:00
alpha_stat.go Added documentation for alpha cli command (#4412) 2020-05-26 13:59:56 -07:00
check.go multicluster: checks for misconfigured mirror services (#4552) 2020-06-08 15:29:34 -07:00
check_test.go Output check result as json (#2666) 2019-05-20 09:04:28 -07:00
completion.go CLI help updates: non-experimental auto-inject; unhide install-cni (#2319) 2019-02-18 15:32:46 -08:00
completion_test.go Bump proxy-init to 1.2.0 (#3397) 2019-09-09 09:06:14 -07:00
dashboard.go Add `as-group` CLI flag (#3952) 2020-01-22 16:38:31 +02:00
diagnostics.go Linkerd CLI command to get control plane diagnostics (#4050) 2020-02-24 09:09:54 -08:00
doc.go Fix issue for debug containers when using custom Docker registry (#3873) 2020-01-17 10:18:03 -08:00
edges.go Add namespace global flag to hold default namespace name (#4469) (#4512) 2020-06-04 10:45:07 -07:00
edges_test.go Add unit test for edges API endpoint (#3306) 2019-08-23 09:28:02 -07:00
endpoints.go Have `linkerd endpoints` use `Destination.Get` (#2990) 2019-07-03 09:11:03 -05:00
endpoints_test.go Have `linkerd endpoints` use `Destination.Get` (#2990) 2019-07-03 09:11:03 -05:00
get.go Add namespace global flag to hold default namespace name (#4469) (#4512) 2020-06-04 10:45:07 -07:00
get_test.go Fix most golint issues that are not comment related (#1982) 2018-12-20 10:37:47 -08:00
inject.go Add --close-wait-timeout inject flag (#4409) 2020-05-21 14:14:14 -07:00
inject_test.go charts: Using downwardAPI to mount labels to the proxy container (#4199) 2020-04-22 10:33:51 -05:00
inject_util.go Fix inject with path and add tests (#3038) 2019-07-05 09:26:25 -05:00
install-cni-plugin.go Remove experimental from CNI (#4038) 2020-02-11 20:10:55 +02:00
install-cni-plugin_test.go Fix CNI config parsing (#3953) 2020-01-23 09:55:04 -08:00
install-sp.go Add `as-group` CLI flag (#3952) 2020-01-22 16:38:31 +02:00
install-sp_test.go Add cluster domain cli flag (#3360) 2019-09-19 16:08:50 -07:00
install.go remove grafana.image.version field (#4571) 2020-06-08 17:15:30 -05:00
install_addon_test.go Add addon-overwrite flag (#4377) 2020-05-21 21:01:41 +05:30
install_cni_helm_test.go Improve cni resources labels (#4032) 2020-02-11 12:10:08 +02:00
install_helm_test.go Extend Helm chart to allow disabling secret resources for self-signed certs. (#4289) 2020-06-03 09:26:24 -05:00
install_test.go Extend Helm chart to allow disabling secret resources for self-signed certs. (#4289) 2020-06-03 09:26:24 -05:00
logs.go Add `as-group` CLI flag (#3952) 2020-01-22 16:38:31 +02:00
logs_test.go Introduce inject integration tests (#2616) 2019-04-05 11:42:49 -07:00
main_test.go add flag for dumping rejected results to folder for use with external diff (#4509) 2020-06-04 10:49:41 -04:00
metrics.go Add namespace global flag to hold default namespace name (#4469) (#4512) 2020-06-04 10:45:07 -07:00
metrics_diagnostics_util.go Linkerd CLI command to get control plane diagnostics (#4050) 2020-02-24 09:09:54 -08:00
metrics_diagnostics_util_test.go Linkerd CLI command to get control plane diagnostics (#4050) 2020-02-24 09:09:54 -08:00
multicluster.go Change help text to use source/target terminology in multicluster CLI (#4523) 2020-06-02 12:33:18 -04:00
profile.go Add namespace global flag to hold default namespace name (#4469) (#4512) 2020-06-04 10:45:07 -07:00
profile_test.go Allow setting custom cluster domain in service profiles (#3148) 2019-08-07 09:49:54 -07:00
public_api.go Add namespace global flag to hold default namespace name (#4469) (#4512) 2020-06-04 10:45:07 -07:00
range_slice.go Enable mixed configuration of skip-[inbound|outbound]-ports (#3766) 2019-12-20 09:32:13 -05:00
range_slice_test.go Enable mixed configuration of skip-[inbound|outbound]-ports (#3766) 2019-12-20 09:32:13 -05:00
root.go Add namespace global flag to hold default namespace name (#4469) (#4512) 2020-06-04 10:45:07 -07:00
routes.go Fix routes wide output formatting for empty values (#4239) 2020-04-07 14:35:55 -05:00
routes_test.go Fix routes wide output formatting for empty values (#4239) 2020-04-07 14:35:55 -05:00
stat.go Properly show the meshed count for non-selector services (#4446) 2020-05-20 10:08:27 -07:00
stat_test.go Add validation to ensure stat time window is at least 15s (#3720) 2019-12-04 08:12:01 +02:00
tap.go Add namespace global flag to hold default namespace name (#4469) (#4512) 2020-06-04 10:45:07 -07:00
tap_test.go Add TapEvent headers and trailers to the tap protobuf (#3410) 2019-09-29 09:54:37 -07:00
top.go Add namespace global flag to hold default namespace name (#4469) (#4512) 2020-06-04 10:45:07 -07:00
uninject.go Upgrade golangci-lint to v1.23.8 (#4181) 2020-03-18 09:13:19 -05:00
uninject_test.go Remove envoy, contour restrictions (#4092) 2020-03-02 09:18:51 -05:00
uninstall.go `linkerd uninstall` errors when attempting to delete PSP (#4234) 2020-04-07 11:01:11 -05:00
uninstall_test.go Add uninstall cmd functionality to cli (#3622) (#4200) 2020-04-02 12:35:39 -05:00
upgrade.go Extend Helm chart to allow disabling secret resources for self-signed certs. (#4289) 2020-06-03 09:26:24 -05:00
upgrade_test.go Extend Helm chart to allow disabling secret resources for self-signed certs. (#4289) 2020-06-03 09:26:24 -05:00
version.go Improve proxy version diagnostics (#4244) 2020-04-16 11:28:19 -07:00
version_test.go Improve proxy version diagnostics (#4244) 2020-04-16 11:28:19 -07:00