Merge branch 'master' into bump_dapr_dep

dapr · Jul 16, 2024 · 0234ab5 · 0234ab5
2 parents f488b44 + 4bb66cd
commit 0234ab5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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"
+  app.kubernetes.io/managed-by: "helm"