github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/grafana] Enable extra init containers and extra emptyDir mounts (#12343)

Browse Source 
* [stable/grafana] add extraInitContainers

Signed-off-by: Ioannis Koutras <ioannis.koutras@gmail.com>

* [stable/grafana] add extraEmptyDirMounts

Signed-off-by: Ioannis Koutras <ioannis.koutras@gmail.com>
This commit is contained in:
Yannis Koutras
2019-03-20 01:24:24 -07:00
committed by Kubernetes Prow Robot
parent 90a25d646a
commit 985fcf71e0
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/grafana/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: grafana
version: 2.3.1
version: 2.3.3
appVersion: 6.0.2
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
stable/grafana/README.md
+2
View File
@@ -54,6 +54,7 @@ The command removes all the Kubernetes components associated with the chart and
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `tolerations` | Toleration labels for pod assignment | `[]` |
| `affinity` | Affinity settings for pod assignment | `{}` |
| `extraInitContainers` | Init containers to add to the grafana pod | `{}` |
| `extraContainers` | Sidecar containers to add to the grafana pod | `{}` |
| `persistence.enabled` | Use persistent volume to store data | `false` |
| `persistence.initChownData` | Change ownership of persistent volume on initialization | `true` |
@@ -68,6 +69,7 @@ The command removes all the Kubernetes components associated with the chart and
| `extraSecretMounts` | Additional grafana server secret mounts | `[]` |
| `extraVolumeMounts` | Additional grafana server volume mounts | `[]` |
| `extraConfigmapMounts` | Additional grafana server configMap volume mounts | `[]` |
| `extraEmptyDirMounts` | Additional grafana server emptyDir volume mounts | `[]` |
| `plugins` | Plugins to be loaded along with Grafana | `[]` |
| `datasources` | Configure grafana datasources (passed through tpl) | `{}` |
| `notifiers` | Configure grafana notifiers | `{}` |
stable/grafana/templates/deployment.yaml
+12 -1
View File
@@ -43,7 +43,7 @@ spec:
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
{{- if ( or .Values.persistence.enabled .Values.dashboards .Values.sidecar.datasources.enabled) }}
{{- if ( or .Values.persistence.enabled .Values.dashboards .Values.sidecar.datasources.enabled .Values.extraInitContainers) }}
initContainers:
{{- end }}
{{- if ( and .Values.persistence.enabled .Values.persistence.initChownData ) }}
@@ -101,6 +101,9 @@ spec:
- name: sc-datasources-volume
mountPath: "/etc/grafana/provisioning/datasources"
{{- end}}
{{- if .Values.extraInitContainers }}
{{ toYaml .Values.extraInitContainers | indent 8 }}
{{- end }}
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
@@ -209,6 +212,10 @@ spec:
subPath: {{ .subPath | default "" }}
readOnly: {{ .readOnly }}
{{- end }}
{{- range .Values.extraEmptyDirMounts }}
- name: {{ .name }}
mountPath: {{ .mountPath }}
{{- end }}
ports:
- name: service
containerPort: {{ .Values.service.port }}
@@ -345,3 +352,7 @@ spec:
persistentVolumeClaim:
claimName: {{ .existingClaim }}
{{- end }}
{{- range .Values.extraEmptyDirMounts }}
- name: {{ .name }}
emptyDir: {}
{{- end }}
stable/grafana/values.yaml
+7
View File
@@ -48,6 +48,11 @@ extraConfigmapMounts: []
# readOnly: true
extraEmptyDirMounts: []
# - name: provisioning-notifiers
# mountPath: /etc/grafana/provisioning/notifiers
## Assign a PriorityClassName to pods if set
# priorityClassName:
@@ -116,6 +121,8 @@ tolerations: []
##
affinity: {}
extraInitContainers: []
## Enable an Specify container in extraContainers. This is meant to allow adding an authentication proxy to a grafana pod
extraContainers: |
# - name: proxy