Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-05 14:57:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/grafana-operator] Fix: volumes and secret mounts for grafana-operator (#18233)

Browse Source 
* feat: allow templating of service account name

Signed-off-by: Arne Claus <arne.claus@trivago.com>

* fix: indentation of tolerations, nodeselector, strategy

Signed-off-by: Arne Claus <arne.claus@trivago.com>

* feat: add secret support again
fix: placement of extraVolumes, extraVolumeMounts

Signed-off-by: Arne Claus <arne.claus@trivago.com>

* feat: add secrets to values.yamlf

Signed-off-by: Arne Claus <arne.claus@trivago.com>

* chore: readme generation

Signed-off-by: Arne Claus <arne.claus@trivago.com>

* increase feature version

Signed-off-by: Arne Claus <arne.claus@trivago.com>

* fix: remove stray {{end}}

Signed-off-by: Arne Claus <arne.claus@trivago.com>

* fix: move strategy to correct position
chore: move tolerations, nodeSelectore, volumes above containers

Signed-off-by: Arne Claus <arne.claus@trivago.com>

* Update bitnami/grafana-operator/templates/grafana.yaml

Co-authored-by: David Gomez <davidbhlm@gmail.com>
Signed-off-by: Arne Claus <arne.claus@gmail.com>

---------

Signed-off-by: Arne Claus <arne.claus@trivago.com>
Signed-off-by: Arne Claus <arne.claus@gmail.com>
Signed-off-by: David Gomez <dgomezleon@vmware.com>
Co-authored-by: David Gomez <davidbhlm@gmail.com>
Co-authored-by: David Gomez <dgomezleon@vmware.com>
This commit is contained in:
Arne Claus
2023-08-10 11:12:13 +02:00
committed by GitHub
parent 98fd8d8e91
commit 02de09acdc
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/grafana-operator/Chart.yaml
View File

@@ -25,4 +25,4 @@ maintainers:
name: grafana-operator
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/grafana-operator
version: 3.2.2
version: 3.3.0

3
bitnami/grafana-operator/README.md
View File

@@ -257,7 +257,8 @@ For more information, refer to the [documentation on the differences between the
| `grafana.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` |
| `grafana.updateStrategy` | Set up update strategy for Grafana installation. | `{}` |
| `grafana.extraVolumes` | Optionally specify extra list of additional volumes for the grafana pod(s) | `[]` |
| `grafana.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the grafana container(s) | `[]` |
| `grafana.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the grafana container | `[]` |
| `grafana.secrets` | Optionally specify a list of secrets to be mounted to the grafana pod(s) | `[]` |
| `grafana.sidecars` | Add additional sidecar containers to the grafana pod(s) | `[]` |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

47
bitnami/grafana-operator/templates/grafana.yaml
View File

@@ -65,9 +65,7 @@ spec:
{{- end }}
{{- if .Values.grafana.serviceAccount }}
serviceAccount:
{{- with .Values.grafana.serviceAccount }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount "context" $ ) | nindent 4 }}
{{- end }}
deployment:
metadata:
@@ -76,6 +74,9 @@ spec:
{{- end }}
spec:
replicas: {{ .Values.grafana.replicaCount }}
{{- if .Values.grafana.updateStrategy }}
strategy: {{ toYaml .Values.grafana.updateStrategy | nindent 8 }}
{{- end }}
template:
spec:
{{- include "common.images.pullSecrets" (dict "images" (list .Values.grafana.image) "global" .Values.global) | nindent 10 }}
@@ -96,6 +97,25 @@ spec:
{{- if .Values.grafana.podSecurityContext.enabled }}
securityContext: {{- omit .Values.grafana.podSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.grafana.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.grafana.tolerations "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.grafana.nodeSelector }}
nodeSelector: {{ toYaml .Values.grafana.nodeSelector | nindent 12 }}
{{- end }}
{{- if .Values.grafana.extraVolumes | or .Values.grafana.secrets }}
volumes:
{{- range .Values.grafana.secrets }}
- name: '{{.}}'
secret:
defaultMode: 420
optional: true
secretName: '{{.}}'
{{- end }}
{{- if .Values.grafana.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.grafana.extraVolumes "context" $) | nindent 12 }}
{{- end }}
{{- end }}
containers:
- name: grafana
image: {{ include "common.images.image" (dict "imageRoot" .Values.grafana.image "global" .Values.global) }}
@@ -133,26 +153,13 @@ spec:
port: 3000
scheme: HTTP
{{- end }}
{{- if .Values.grafana.extraVolumeMounts }}
volumeMounts:
{{- include "common.tplvalues.render" (dict "value" .Values.grafana.extraVolumeMounts "context" $) | nindent 16 }}
{{- end }}
{{- if .Values.grafana.sidecars }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.sidecars "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.grafana.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.grafana.tolerations "context" $) | nindent 6 }}
{{- end }}
{{- if .Values.grafana.nodeSelector }}
nodeSelector: {{ toYaml .Values.grafana.nodeSelector | nindent 6 }}
{{- end }}
{{- if .Values.grafana.updateStrategy }}
strategy: {{ toYaml .Values.grafana.updateStrategy | nindent 6 }}
{{- end }}
{{- if .Values.grafana.extraVolumeMounts }}
extraVolumeMounts:
{{- include "common.tplvalues.render" (dict "value" .Values.grafana.extraVolumeMounts "context" $) | nindent 6 }}
{{- end }}
{{- if .Values.grafana.extraVolumes }}
extraVolumes:
{{- include "common.tplvalues.render" (dict "value" .Values.grafana.extraVolumes "context" $) | nindent 6 }}
{{- end }}
{{- if .Values.grafana.ingress.enabled }}
ingress:
spec:

5
bitnami/grafana-operator/values.yaml
View File

@@ -758,9 +758,12 @@ grafana:
## @param grafana.extraVolumes Optionally specify extra list of additional volumes for the grafana pod(s)
##
extraVolumes: []
## @param grafana.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the grafana container(s)
## @param grafana.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the grafana container
##
extraVolumeMounts: []
## @param grafana.secrets Optionally specify a list of secrets to be mounted to the grafana pod(s)
##
secrets: []
## @param grafana.sidecars Add additional sidecar containers to the grafana pod(s)
## e.g:
## sidecars: