Skip to content

Commit

Permalink
feat: Allow annotations for ingress resource (#272)
Browse files Browse the repository at this point in the history
* feat: Allow annotations for ingress resource

Signed-off-by: Thomas O'Neill <toneill@new-innov.com>

* revert: revert quoting of image tag

Signed-off-by: Thomas O'Neill <toneill@new-innov.com>

---------

Signed-off-by: Thomas O'Neill <toneill@new-innov.com>
Co-authored-by: Thomas O'Neill <toneill@new-innov.com>
  • Loading branch information
toneill818 and toneill-newinnov authored Jul 16, 2024
1 parent a92b8cd commit 4bb66cd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions chart/dapr-dashboard/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ helm install dapr-dashboard dapr/dapr-dashboard
| `ingress.host` | Fully qualified hostname of the dashboard URL (e.g `dashboard.dapr.local`) | `` |
| `ingress.tls.enabled` | If true, enables TLS on the ingress for the Dashboard | `false` |
| `ingress.tls.secretName` | Name of the Kubernetes secret containing the TLS certificate (key/certificate) for the Dashboard. Ignored if `dapr_dashboard.ingress.tls.enabled` is `false`. | `` |
| `ingress.annotations` | Annotations for the ingress resource | `{}` |
| `registry` | Docker image registry | `docker.io/daprio` |
| `tag` | Docker image version tag | latest release |
| `logAsJson` | Json log format for control plane services | `false` |
Expand Down
4 changes: 4 additions & 0 deletions chart/dapr-dashboard/templates/dapr_dashboard_ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ metadata:
{{- range $key, $value := .Values.k8sLabels }}
{{ $key }}: {{ tpl $value $ }}
{{- end }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className | quote }}
Expand Down
3 changes: 2 additions & 1 deletion chart/dapr-dashboard/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ingress:
tls:
enabled: false
secretName:
annotations: {}

runAsNonRoot: true
serviceType: ClusterIP
Expand All @@ -48,4 +49,4 @@ k8sLabels:
app.kubernetes.io/name: "dapr-dashboard"
app.kubernetes.io/version: "{{ .Values.image.tag }}"
app.kubernetes.io/part-of: "dapr"
app.kubernetes.io/managed-by: "helm"
app.kubernetes.io/managed-by: "helm"

0 comments on commit 4bb66cd

Please sign in to comment.