Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-02 16:17:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/grafana-operator] grafana.serviceAccount config (#7070)

Browse Source 
Co-authored-by: Alejandro Moreno <amorenoc@vmware.com>
This commit is contained in:
Joshua S
2021-07-28 07:51:26 -07:00
committed by GitHub
parent 5a5a8307ad
commit 6b887caa68
4 changed files with 16 additions and 4 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 @@ name: grafana-operator
sources:
- https://github.com/integr8ly/grafana-operator
- https://github.com/bitnami/bitnami-docker-grafana-operator
version: 0.8.1
version: 0.8.2

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

@@ -215,6 +215,7 @@ This solution allows to easily deploy multiple Grafana instances compared to the
| `grafana.image.repository` | Grafana image name | `bitnami/grafana` |
| `grafana.image.tag` | Grafana image tag | `7.5.10-debian-10-r9` |
| `grafana.image.pullSecrets` | Grafana image pull secrets | `[]` |
| `grafana.serviceAccount` | Additional service account configuration | `{}` |
| `grafana.podSecurityContext.enabled` | Enable pods security context | `true` |
| `grafana.podSecurityContext.runAsUser` | User ID for the pods | `1001` |
| `grafana.podSecurityContext.runAsGroup` | User ID for the pods | `1001` |
@@ -363,4 +364,4 @@ Find more information about how to deal with common errors related to Bitnami’
```bash
$ helm upgrade my-release bitnami/grafana-operator
```
```

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

@@ -39,8 +39,12 @@ spec:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 6 }}
{{- end }}
{{- $imagePullSecrets := include "common.images.pullSecrets" (dict "images" (list .Values.operator.image .Values.grafana.image .Values.grafanaPluginInit.image) "global" .Values.global) }}
{{- if not (empty ($imagePullSecrets)) }}
serviceAccount: {{- $imagePullSecrets | nindent 4 }}
{{- if (not (empty ($imagePullSecrets))) | or .Values.grafana.serviceAccount }}
serviceAccount:
{{- with .Values.grafana.serviceAccount }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- $imagePullSecrets | nindent 4 }}
{{- end }}
{{- if .Values.grafana.sidecars }}
containers:

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

@@ -270,6 +270,13 @@ grafana:
## - myRegistryKeySecretName
##
pullSecrets: []
## @param grafana.serviceAccount Additional service account configuration
## Ref: https://github.com/integr8ly/grafana-operator/blob/master/documentation/deploy_grafana.md#configuring-the-serviceaccount
## e.g:
## serviceAccount:
## annotations:
## iam.gke.io/gcp-service-account: "grafana@preprodz.iam.gserviceaccount.com"
serviceAccount: {}
## Pod securityContext
## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
## @param grafana.podSecurityContext.enabled Enable pods security context