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

[bitnami/grafana-operator]: Grafana object to follow new CRD (#18038)

Browse Source
This commit is contained in:
Juan Ariza Toledano
2023-08-03 12:05:46 +02:00
committed by GitHub
parent 1db5c4e7ef
commit 87da4b985c
4 changed files with 62 additions and 98 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.1.4
version: 3.2.0

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

@@ -242,11 +242,7 @@ For more information, refer to the [documentation on the differences between the
| `grafana.persistence.annotations` | Add annotations to the persistent volume | `{}` |
| `grafana.persistence.size` | Define the size of the PersistentVolumeClaim to request for | `10Gi` |
| `grafana.config` | grafana.ini configuration for the instance for this to configure please look at upstream docs | `{}` |
| `grafana.configMaps` | Extra configMaps to mount into the grafana pod | `[]` |
| `grafana.secrets` | Extra secrets to mount into the grafana pod | `[]` |
| `grafana.jsonnetLibrarySelector` | Configuring the read for jsonnetLibraries to pull in. | `{}` |
| `grafana.dashboardLabelSelectors` | This selects dashboards on the label. | `{}` |
| `grafana.dashboardNamespaceSelector` | Watch for dashboards only in the Namespaces that have the specified namespace label | `{}` |
| `grafana.livenessProbe.enabled` | Enable livenessProbe | `true` |
| `grafana.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `120` |
| `grafana.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` |

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

@@ -20,31 +20,33 @@ spec:
client:
timeout: {{ .Values.grafana.client.timeout }}
{{- if .Values.grafana.persistence.enabled }}
dataStorage:
labels: {{- include "common.labels.standard" . | nindent 6 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 6 }}
persistentVolumeClaim:
metadata:
labels: {{- include "common.labels.standard" . | nindent 8 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
{{- end }}
{{- if or .Values.commonAnnotations .Values.grafana.persistence.annotations }}
annotations:
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
{{- end }}
{{- if .Values.grafana.persistence.annotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.persistence.annotations "context" $ ) | nindent 8 }}
{{- end }}
{{- end }}
{{- if or .Values.commonAnnotations .Values.grafana.persistence.annotations }}
annotations:
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 6 }}
{{- end }}
{{- if .Values.grafana.persistence.annotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.persistence.annotations "context" $ ) | nindent 6 }}
{{- end }}
{{- end }}
accessModes:
{{- range .Values.grafana.persistence.accessModes }}
spec:
accessModes:
{{- range .Values.grafana.persistence.accessModes }}
- {{ . | quote }}
{{- end }}
resources:
requests:
storage: {{ .Values.grafana.persistence.size | quote }}
{{- if .Values.grafana.persistence.existingVolume }}
volumeName: {{ .Values.grafana.persistence.existingVolume }}
{{- end }}
size: {{ .Values.grafana.persistence.size }}
{{- if .Values.grafana.persistence.existingVolume }}
volumeName: {{ .Values.grafana.persistence.existingVolume }}
{{- end }}
{{- if .Values.grafana.persistence.storageClass }}
class: {{ .Values.grafana.persistence.storageClass }}
{{- end }}
{{- include "common.storage.class" (dict "persistence" .Values.grafana.persistence "global" .Values.global) | nindent 6 }}
{{- end }}
service:
{{- if or .Values.commonAnnotations .Values.grafana.service.annotations }}
@@ -88,12 +90,10 @@ spec:
{{- end }}
{{- end }}
deployment:
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 6 }}
{{- end }}
{{- if .Values.grafana.envFrom }}
envFrom: {{- include "common.tplvalues.render" (dict "value" .Values.grafana.envFrom "context" $ ) | nindent 6 }}
{{- end }}
metadata:
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
{{- end }}
spec:
replicas: {{ .Values.grafana.replicaCount }}
template:
@@ -126,6 +126,9 @@ spec:
{{- if .Values.grafana.resources }}
resources: {{- toYaml .Values.grafana.resources | nindent 16 }}
{{- end }}
{{- if .Values.grafana.envFrom }}
envFrom: {{- toYaml .Values.grafana.envFrom | nindent 16 }}
{{- end }}
{{- if .Values.grafana.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.grafana.tolerations "context" $) | nindent 6 }}
{{- end }}
@@ -149,55 +152,49 @@ spec:
{{- if and .Values.grafana.ingress.ingressClassName (include "common.ingress.supportsIngressClassname" .) }}
ingressClassName: {{ .Values.grafana.ingress.ingressClassName | quote }}
{{- end }}
tlsEnabled: {{ .Values.grafana.ingress.tls }}
tlsSecretName: {{ .Values.grafana.ingress.tlsSecret }}
rules:
{{- if .Values.grafana.ingress.host }}
- host: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.host "context" $) }}
http:
{{- else }}
- http:
{{- end }}
paths:
- path: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.path "context" $) }}
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.pathType "context" $) }}
{{- end }}
backend:
service:
name: {{ printf "%s-grafana-service" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
port:
number: 3000
{{- if or .Values.commonLabels .Values.grafana.ingress.labels .Values.grafana.labels }}
labels:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 6 }}
name: grafana
{{- if .Values.grafana.ingress.host }}
host: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.host "context" $) }}
{{- end }}
{{- if .Values.grafana.ingress.tls }}
tls:
- hosts:
- {{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.host "context" $) }}
secretName: {{ .Values.grafana.ingress.tlsSecret }}
{{- end }}
{{- if .Values.grafana.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.labels "context" $ ) | nindent 6 }}
metadata:
labels: {{- include "common.labels.standard" . | nindent 8 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
{{- end }}
{{- if .Values.grafana.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.labels "context" $ ) | nindent 8 }}
{{- end }}
{{- if .Values.grafana.ingress.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.ingress.labels "context" $ ) | nindent 8 }}
{{- end }}
{{- if or .Values.commonAnnotations .Values.grafana.ingress.annotations }}
annotations:
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
{{- end }}
{{- if .Values.grafana.ingress.annotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.ingress.annotations "context" $ ) | nindent 8 }}
{{- end }}
{{- end }}
{{- if .Values.grafana.ingress.labels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.ingress.labels "context" $ ) | nindent 6 }}
{{- end }}
{{- end }}
{{- if or .Values.commonAnnotations .Values.grafana.ingress.annotations }}
annotations:
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 6 }}
{{- end }}
{{- if .Values.grafana.ingress.annotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.grafana.ingress.annotations "context" $ ) | nindent 6 }}
{{- end }}
{{- end }}
{{- end }}
config: {{- include "common.tplvalues.render" ( dict "value" .Values.grafana.config "context" $ ) | nindent 4 }}
{{- if .Values.grafana.configMaps }}
configMaps: {{ toYaml .Values.grafana.configMaps | nindent 4 }}
{{- end }}
{{- if .Values.grafana.secrets }}
secrets: {{ toYaml .Values.grafana.secrets | nindent 4 }}
{{- end }}
{{- if .Values.grafana.dashboardNamespaceSelector }}
dashboardNamespaceSelector: {{- include "common.tplvalues.render" (dict "value" .Values.grafana.dashboardNamespaceSelector "context" $ ) | nindent 4 }}
{{- end }}
jsonnet:
libraryLabelSelector: {{- include "common.tplvalues.render" (dict "value" .Values.grafana.jsonnetLibrarySelector "context" $ ) | nindent 6 }}
{{- end }}

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

@@ -706,41 +706,12 @@ grafana:
# # allowed_domains: example.com
# allow_sign_up: "True"
disable_gravatar: "false"
## @param grafana.configMaps Extra configMaps to mount into the grafana pod
## Ref: https://github.com/integr8ly/grafana-operator/blob/master/documentation/extra_files.md
## e.g:
## configMaps:
## - myCustomConfigMap
##
configMaps: []
## @param grafana.secrets Extra secrets to mount into the grafana pod
## Ref: https://github.com/integr8ly/grafana-operator/blob/master/documentation/extra_files.md
## e.g:
## secrets:
## - myCustomSecret
##
secrets: []
## @param grafana.jsonnetLibrarySelector [object] Configuring the read for jsonnetLibraries to pull in.
## Ref: https://github.com/integr8ly/grafana-operator/blob/master/documentation/deploy_grafana.md#jsonnet-library-discovery
##
jsonnetLibrarySelector:
matchLabels:
app.kubernetes.io/instance: "{{ .Release.Name }}"
## @param grafana.dashboardLabelSelectors [object] This selects dashboards on the label.
## A cachall is not possible so you need to define at least one label selector here.
## Ref: https://github.com/integr8ly/grafana-operator/blob/master/documentation/deploy_grafana.md#deploying-grafana
##
dashboardLabelSelectors:
- matchLabels:
app.kubernetes.io/instance: "{{ .Release.Name }}"
## @param grafana.dashboardNamespaceSelector Watch for dashboards only in the Namespaces that have the specified namespace label
## Ref: https://github.com/grafana-operator/grafana-operator/blob/master/documentation/multi_namespace_support.md#2-dashboardnamespaceselector
## e.g:
## dashboardNamespaceSelector:
## matchLabels:
## key: value
##
dashboardNamespaceSelector: {}
## Grafana containers' liveness probe
## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
## @param grafana.livenessProbe.enabled Enable livenessProbe