From 4bb66cda4947d92599774b26ee8bc2dc6f89a55e Mon Sep 17 00:00:00 2001 From: Thomas O'Neill Date: Tue, 16 Jul 2024 12:33:58 -0400 Subject: [PATCH] feat: Allow annotations for ingress resource (#272) * feat: Allow annotations for ingress resource Signed-off-by: Thomas O'Neill * revert: revert quoting of image tag Signed-off-by: Thomas O'Neill --------- Signed-off-by: Thomas O'Neill Co-authored-by: Thomas O'Neill --- chart/dapr-dashboard/README.md | 1 + chart/dapr-dashboard/templates/dapr_dashboard_ingress.yaml | 4 ++++ chart/dapr-dashboard/values.yaml | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/chart/dapr-dashboard/README.md b/chart/dapr-dashboard/README.md index 31bc13b..3503603 100644 --- a/chart/dapr-dashboard/README.md +++ b/chart/dapr-dashboard/README.md @@ -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` | diff --git a/chart/dapr-dashboard/templates/dapr_dashboard_ingress.yaml b/chart/dapr-dashboard/templates/dapr_dashboard_ingress.yaml index 2263465..9cbc7de 100644 --- a/chart/dapr-dashboard/templates/dapr_dashboard_ingress.yaml +++ b/chart/dapr-dashboard/templates/dapr_dashboard_ingress.yaml @@ -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 }} diff --git a/chart/dapr-dashboard/values.yaml b/chart/dapr-dashboard/values.yaml index 750657c..14db823 100644 --- a/chart/dapr-dashboard/values.yaml +++ b/chart/dapr-dashboard/values.yaml @@ -24,6 +24,7 @@ ingress: tls: enabled: false secretName: + annotations: {} runAsNonRoot: true serviceType: ClusterIP @@ -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" \ No newline at end of file + app.kubernetes.io/managed-by: "helm"