Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Allow annotations for ingress resource #272

Merged
merged 4 commits into from
Jul 16, 2024
Merged

feat: Allow annotations for ingress resource #272

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0588511
feat: Allow annotations for ingress resource
toneill-newinnov Dec 14, 2023
d958403
Merge branch 'dapr:master' into feat/ingress-annotations
toneill818 Feb 29, 2024
3690bd6
Merge branch 'dapr:master' into feat/ingress-annotations
toneill818 Feb 29, 2024
5f63ca3
revert: revert quoting of image tag
toneill-newinnov Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions chart/dapr-dashboard/README.md
View file
Open in desktop
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
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions chart/dapr-dashboard/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ component: dashboard
image:
registry: docker.io/daprio
name: dashboard
tag: 'edge'
tag: "edge"
imagePullPolicy: IfNotPresent
imagePullSecrets: ""

Expand All @@ -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"
Loading