diff options
| author | Maximilien R <maximilien@deuxfleurs.fr> | 2022-12-12 00:53:57 +0100 |
|---|---|---|
| committer | Maximilien R <maximilien@deuxfleurs.fr> | 2022-12-12 00:53:57 +0100 |
| commit | 980572a8872c56ea9572ff03579ebb9a65013775 (patch) | |
| tree | 946776bf1ab7818ac94a253d263b13607c82d8b3 /script/helm/garage/templates/ingress.yaml | |
| parent | defd7d9e6353e10b0b9d58b66aad4f04e7d50c41 (diff) | |
| parent | 7a0014b6f71f9d4a445b378deb215b088e02e036 (diff) | |
| download | garage-980572a8872c56ea9572ff03579ebb9a65013775.tar.gz garage-980572a8872c56ea9572ff03579ebb9a65013775.zip | |
Merge pull request 'helm: ingress improvements' (#422) from patrickjahns:helm-refactor-ingress into main
As discussed in the chat yesterday, I want to propose to disable the ingress per default.
The motivation behind this change is, that per default the ingress is "misconfigured"
meaning it can not work with the default values and requires a user of the chart to
add additional configuration. When installing the chart per default, I would not
expect to already expose garage publicly without my explicit configuration to do so
Commenting the ingressClass resource also allows for relying only on
annotations - otherwise the ingressClass would be always set to nginx
or require a user to override it with ingressClass: null
A small change on top, I've added the ability to specify user defined labels per ingress
Diffstat (limited to 'script/helm/garage/templates/ingress.yaml')
| -rw-r--r-- | script/helm/garage/templates/ingress.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/script/helm/garage/templates/ingress.yaml b/script/helm/garage/templates/ingress.yaml index c4ee5a3f..35225daa 100644 --- a/script/helm/garage/templates/ingress.yaml +++ b/script/helm/garage/templates/ingress.yaml @@ -18,6 +18,9 @@ metadata: name: {{ $fullName }}-s3-api labels: {{- include "garage.labels" . | nindent 4 }} + {{- with .Values.ingress.s3.api.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.ingress.s3.api.annotations }} annotations: {{- toYaml . | nindent 4 }} @@ -80,6 +83,9 @@ metadata: name: {{ $fullName }}-s3-web labels: {{- include "garage.labels" . | nindent 4 }} + {{- with .Values.ingress.s3.web.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.ingress.s3.web.annotations }} annotations: {{- toYaml . | nindent 4 }} |