Merge branch 'master' into patch-1

fluxcd · Jul 14, 2020 · 6028b91 · 6028b91
2 parents 4e402ea + e4117fd
commit 6028b91
Show file tree

Hide file tree

Showing 4 changed files with 739 additions and 0 deletions.
diff --git a/chart/helm-operator/README.md b/chart/helm-operator/README.md
@@ -147,6 +147,7 @@ chart and their default values.
 | `readinessProbe.failureThreshold`                 | `3`                                                  | The number of times the readiness probe can failed before the container is marked as unready
 | `initContainers`                                  | `[]`                                                 | Init containers and their specs
 | `hostAliases`                                     | `{}`                                                 | Host aliases allow the modification of the hosts file (`/etc/hosts`) inside Helm Operator container. See <https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/>
+| `dashboards.enabled`                               | `false`                                              | If enabled, helm-operator will create a configmap with a dashboard in json that's going to be picked up by grafana (see [sidecar.dashboards.enabled](https://github.com/helm/charts/tree/master/stable/grafana#configuration))
 
 ## How-to