diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index ccda47db82..fb0a50f954 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.5.7 +version: 8.5.8 appVersion: 11.2.2-security-01 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl index 716e27d022..24ee005276 100644 --- a/charts/grafana/templates/_pod.tpl +++ b/charts/grafana/templates/_pod.tpl @@ -649,6 +649,9 @@ containers: volumeMounts: - name: sc-datasources-volume mountPath: "/etc/grafana/provisioning/datasources" + {{- with .Values.sidecar.datasources.extraMounts }} + {{- toYaml . | trim | nindent 6 }} + {{- end }} {{- end}} {{- if .Values.sidecar.notifiers.enabled }} - name: {{ include "grafana.name" . }}-sc-notifiers @@ -753,6 +756,9 @@ containers: volumeMounts: - name: sc-notifiers-volume mountPath: "/etc/grafana/provisioning/notifiers" + {{- with .Values.sidecar.notifiers.extraMounts }} + {{- toYaml . | trim | nindent 6 }} + {{- end }} {{- end}} {{- if .Values.sidecar.plugins.enabled }} - name: {{ include "grafana.name" . }}-sc-plugins @@ -857,6 +863,9 @@ containers: volumeMounts: - name: sc-plugins-volume mountPath: "/etc/grafana/provisioning/plugins" + {{- with .Values.sidecar.plugins.extraMounts }} + {{- toYaml . | trim | nindent 6 }} + {{- end }} {{- end}} - name: {{ .Chart.Name }} {{- $registry := .Values.global.imageRegistry | default .Values.image.registry -}} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 1d05a6fc19..6beae1bf49 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -923,7 +923,7 @@ sidecar: # This is needed if skipReload is true, to load any alerts defined at startup time. # Deploy the alert sidecar as an initContainer. initAlerts: false - # Additional alert sidecar volume mounts + # Additional alerts sidecar volume mounts extraMounts: [] # Sets the size limit of the alert sidecar emptyDir volume sizeLimit: {} @@ -1001,7 +1001,7 @@ sidecar: allowUiUpdates: false # allow Grafana to replicate dashboard structure from filesystem foldersFromFilesStructure: false - # Additional dashboard sidecar volume mounts + # Additional dashboards sidecar volume mounts extraMounts: [] # Sets the size limit of the dashboard sidecar emptyDir volume sizeLimit: {} @@ -1056,6 +1056,8 @@ sidecar: # This is needed if skipReload is true, to load any datasources defined at startup time. # Deploy the datasources sidecar as an initContainer. initDatasources: false + # Additional datasources sidecar volume mounts + extraMounts: [] # Sets the size limit of the datasource sidecar emptyDir volume sizeLimit: {} plugins: @@ -1096,6 +1098,8 @@ sidecar: # Deploy the datasource sidecar as an initContainer in addition to a container. # This is needed if skipReload is true, to load any plugins defined at startup time. initPlugins: false + # Additional plugins sidecar volume mounts + extraMounts: [] # Sets the size limit of the plugin sidecar emptyDir volume sizeLimit: {} notifiers: @@ -1136,6 +1140,8 @@ sidecar: # Deploy the notifier sidecar as an initContainer in addition to a container. # This is needed if skipReload is true, to load any notifiers defined at startup time. initNotifiers: false + # Additional notifiers sidecar volume mounts + extraMounts: [] # Sets the size limit of the notifier sidecar emptyDir volume sizeLimit: {}