From 5b1c1d9736c473528988e669703f657928d2e2ed Mon Sep 17 00:00:00 2001 From: Patrick Jahns Date: Wed, 16 Nov 2022 12:21:18 +0100 Subject: [PATCH] feat(helm): allow to add custom labels to created ingress resources --- script/helm/garage/templates/ingress.yaml | 6 ++++++ script/helm/garage/values.yaml | 2 ++ 2 files changed, 8 insertions(+) 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 }} diff --git a/script/helm/garage/values.yaml b/script/helm/garage/values.yaml index 9c1c54c0..608ee53c 100644 --- a/script/helm/garage/values.yaml +++ b/script/helm/garage/values.yaml @@ -93,6 +93,7 @@ ingress: annotations: {} # kubernetes.io/ingress.class: "nginx" # kubernetes.io/tls-acme: "true" + labels: {} hosts: - host: "s3.garage.tld" # garage S3 API endpoint paths: @@ -115,6 +116,7 @@ ingress: annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" + labels: {} hosts: - host: "*.web.garage.tld" # wildcard website access with bucket name prefix paths: