github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/grafana] Template ingress annotations (#22123)

Browse Source 
Signed-off-by: Steven Sheehy <steven.sheehy@hedera.com>
This commit is contained in:
Steven Sheehy
2020-04-26 16:27:28 -07:00
committed by GitHub
parent 3c1b9aae28
commit 0b9b4c50f0
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/grafana/Chart.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: grafana
version: 5.0.14
appVersion: 6.7.1
version: 5.0.15
appVersion: 6.7.3
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
home: https://grafana.net
stable/grafana/README.md
+2 -2
View File
@@ -52,7 +52,7 @@ You have to add --force to your helm upgrade command as the labels of the chart
| `securityContext` | Deployment securityContext | `{"runAsUser": 472, "fsGroup": 472}` |
| `priorityClassName` | Name of Priority Class to assign pods | `nil` |
| `image.repository` | Image repository | `grafana/grafana` |
| `image.tag` | Image tag (`Must be >= 5.0.0`) | `6.7.1` |
| `image.tag` | Image tag (`Must be >= 5.0.0`) | `6.7.3` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Image pull secrets | `{}` |
| `service.type` | Kubernetes service type | `ClusterIP` |
@@ -68,7 +68,7 @@ You have to add --force to your helm upgrade command as the labels of the chart
| `serivce.externalIPs` | service external IP addresses | `[]` |
| `extraExposePorts` | Additional service ports for sidecar containers| `[]` |
| `ingress.enabled` | Enables Ingress | `false` |
| `ingress.annotations` | Ingress annotations | `{}` |
| `ingress.annotations` | Ingress annotations (values are templated) | `{}` |
| `ingress.labels` | Custom labels | `{}` |
| `ingress.path` | Ingress accepted path | `/` |
| `ingress.hosts` | Ingress accepted hostnames | `[]` |
stable/grafana/templates/ingress.yaml
+5 -3
View File
@@ -17,10 +17,12 @@ metadata:
{{- if .Values.ingress.labels }}
{{ toYaml .Values.ingress.labels | indent 4 }}
{{- end }}
{{- with .Values.ingress.annotations }}
{{- if .Values.ingress.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
{{- range $key, $value := .Values.ingress.annotations }}
{{ $key }}: {{ tpl $value $ | quote }}
{{- end }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
tls:
stable/grafana/values.yaml
+2 -1
View File
@@ -50,7 +50,7 @@ livenessProbe:
image:
repository: grafana/grafana
tag: 6.7.1
tag: 6.7.3
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
@@ -129,6 +129,7 @@ extraExposePorts: []
ingress:
enabled: false
# Values can be templated
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"