Skip to content

Commit

Permalink
[stable/grafana] Fix indentation of pod template (helm#17130)
Browse files Browse the repository at this point in the history
* fix indentation of template

Signed-off-by: Ramon Rüttimann <ramon.ruettimann@gmail.com>

* bump chart version

Signed-off-by: Ramon Rüttimann <ramon.ruettimann@gmail.com>
  • Loading branch information
tommyknows authored and kengou committed Sep 18, 2019
1 parent ae2b5a7 commit be96100
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion stable/grafana/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: grafana
version: 3.8.12
version: 3.8.13
appVersion: 6.3.5
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
Expand Down
26 changes: 13 additions & 13 deletions stable/grafana/templates/_pod.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ schedulerName: "{{ .Values.schedulerName }}"
{{- end }}
{{- if .Values.securityContext }}
securityContext:
{{ toYaml .Values.securityContext | indent 8 }}
{{ toYaml .Values.securityContext | indent 2 }}
{{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
Expand All @@ -24,7 +24,7 @@ initContainers:
runAsUser: 0
command: ["chown", "-R", "{{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.runAsUser }}", "/var/lib/grafana"]
resources:
{{ toYaml .Values.initChownData.resources | indent 12 }}
{{ toYaml .Values.initChownData.resources | indent 6 }}
volumeMounts:
- name: storage
mountPath: "/var/lib/grafana"
Expand Down Expand Up @@ -80,13 +80,13 @@ initContainers:
value: "{{ .Values.sidecar.skipTlsVerify }}"
{{- end }}
resources:
{{ toYaml .Values.sidecar.resources | indent 12 }}
{{ toYaml .Values.sidecar.resources | indent 6 }}
volumeMounts:
- name: sc-datasources-volume
mountPath: "/etc/grafana/provisioning/datasources"
{{- end}}
{{- if .Values.extraInitContainers }}
{{ toYaml .Values.extraInitContainers | indent 8 }}
{{ toYaml .Values.extraInitContainers | indent 2 }}
{{- end }}
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
Expand Down Expand Up @@ -115,7 +115,7 @@ containers:
value: "{{ .Values.sidecar.skipTlsVerify }}"
{{- end }}
resources:
{{ toYaml .Values.sidecar.resources | indent 12 }}
{{ toYaml .Values.sidecar.resources | indent 6 }}
volumeMounts:
- name: sc-dashboard-volume
mountPath: {{ .Values.sidecar.dashboards.folder | quote }}
Expand Down Expand Up @@ -258,25 +258,25 @@ containers:
name: {{ .Values.envFromSecret }}
{{- end }}
livenessProbe:
{{ toYaml .Values.livenessProbe | indent 12 }}
{{ toYaml .Values.livenessProbe | indent 6 }}
readinessProbe:
{{ toYaml .Values.readinessProbe | indent 12 }}
{{ toYaml .Values.readinessProbe | indent 6 }}
resources:
{{ toYaml .Values.resources | indent 12 }}
{{ toYaml .Values.resources | indent 6 }}
{{- if .Values.extraContainers }}
{{ toYaml .Values.extraContainers | indent 8}}
{{ toYaml .Values.extraContainers | indent 2}}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
{{ toYaml . | indent 2 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{ toYaml . | indent 2 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{ toYaml . | indent 2 }}
{{- end }}
volumes:
- name: config
Expand Down Expand Up @@ -352,4 +352,4 @@ volumes:
- name: {{ .name }}
emptyDir: {}
{{- end -}}
{{- end }}
{{- end }}

0 comments on commit be96100

Please sign in to comment.