diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 79e8699228..89c9d2b906 100644 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 5.0.9 +version: 5.0.10 appVersion: 6.7.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/README.md b/stable/grafana/README.md index e886cfce00..c96fa0c04e 100644 --- a/stable/grafana/README.md +++ b/stable/grafana/README.md @@ -161,6 +161,7 @@ You have to add --force to your helm upgrade command as the labels of the chart | `testFramework.tag` | `test-framework` image tag. | `v1.1.0` | | `testFramework.securityContext` | `test-framework` securityContext | `{}` | | `downloadDashboards.env` | Environment variables to be passed to the `download-dashboards` container | `{}` | +| `downloadDashboards.resources` | Resources of `download-dashboards` container | `{}` | | `downloadDashboardsImage.repository` | Curl docker image repo | `curlimages/curl` | | `downloadDashboardsImage.tag` | Curl docker image tag | `7.68.0` | | `downloadDashboardsImage.pullPolicy` | Curl docker image pull policy | `IfNotPresent` | diff --git a/stable/grafana/templates/_pod.tpl b/stable/grafana/templates/_pod.tpl index 23842821be..4ac196e876 100644 --- a/stable/grafana/templates/_pod.tpl +++ b/stable/grafana/templates/_pod.tpl @@ -38,6 +38,8 @@ initContainers: imagePullPolicy: {{ .Values.downloadDashboardsImage.pullPolicy }} command: ["/bin/sh"] args: [ "-c", "mkdir -p /var/lib/grafana/dashboards/default && /bin/sh /etc/grafana/download_dashboards.sh" ] + resources: +{{ toYaml .Values.downloadDashboards.resources | indent 6 }} env: {{- range $key, $value := .Values.downloadDashboards.env }} - name: "{{ $key }}" diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml index 9b264c77b1..c02a875d3e 100644 --- a/stable/grafana/values.yaml +++ b/stable/grafana/values.yaml @@ -94,6 +94,7 @@ downloadDashboardsImage: downloadDashboards: env: {} + resources: {} ## Pod Annotations # podAnnotations: {}