Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-02-19 11:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/grafana-operator] add grafana.ingress.pathType (#8541)

Browse Source 
* add grafana.ingress.pathType value

* set default for  to  to match grafana-operator default

* template `.Values.grafana.ingress.hostname` usage in values.yaml #8540

* [bitnami/grafana-operator] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Derek Morgan
2021-12-31 04:06:21 -05:00
committed by GitHub
parent 780fb908f2
commit 2b85adc44e
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,4 +24,4 @@ name: grafana-operator
sources:
- https://github.com/grafana-operator/grafana-operator
- https://github.com/bitnami/bitnami-docker-grafana-operator
version: 2.0.3
version: 2.0.4

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

@@ -212,6 +212,7 @@ For more information, refer to the [documentation on the differences between the
| `grafana.ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` |
| `grafana.ingress.hostname` | The hostname under which the grafana instance should be reachable | `grafana.local` |
| `grafana.ingress.path` | The path for the ingress instance to forward to the grafana app | `/` |
| `grafana.ingress.pathType` | The pathType for the ingress instance to forward to the grafana app | `ImplementationSpecific` |
| `grafana.ingress.labels` | Additional Labels for the ingress resource | `{}` |
| `grafana.ingress.annotations` | Additional Annotations for the ingress resource | `{}` |
| `grafana.ingress.tls` | This enables tls support for the ingress resource | `false` |

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

@@ -160,6 +160,7 @@ spec:
{{- end }}
{{- end }}
path: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.path "context" $) }}
pathType: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.pathType "context" $) }}
config: {{- include "common.tplvalues.render" ( dict "value" .Values.grafana.config "context" $ ) | nindent 4 }}
{{- if .Values.grafana.configMaps }}
configMaps: {{ toYaml .Values.grafana.configMaps | nindent 4 }}

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

@@ -127,7 +127,7 @@ operator:
image:
registry: docker.io
repository: bitnami/grafana-operator
tag: 4.1.1-debian-10-r16
tag: 4.1.1-debian-10-r18
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -386,7 +386,7 @@ grafana:
image:
registry: docker.io
repository: bitnami/grafana
tag: 8.3.3-debian-10-r15
tag: 8.3.3-debian-10-r16
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
@@ -547,6 +547,9 @@ grafana:
## @param grafana.ingress.path The path for the ingress instance to forward to the grafana app
##
path: /
## @param grafana.ingress.pathType The pathType for the ingress instance to forward to the grafana app
##
pathType: ImplementationSpecific
## @param grafana.ingress.labels Additional Labels for the ingress resource
##
labels: {}
@@ -601,7 +604,7 @@ grafana:
server:
root_url: |-
{{- if .Values.grafana.ingress.enabled }}
{{ if .Values.grafana.ingress.tls }}https{{ else }}http{{ end }}://{{ .Values.grafana.ingress.hostname }}
{{ if .Values.grafana.ingress.tls }}https{{ else }}http{{ end }}://{{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.hostname "context" $) }}
{{- else }}
http://localhost:3000
{{- end }}