From 881c9229720d9556cc8d5cf13ec8d9b7275b5b86 Mon Sep 17 00:00:00 2001 From: mergwyn Date: Wed, 3 Apr 2024 17:09:34 +0100 Subject: [PATCH] helm chart: make s3 ingress annotations consistent (#5463) Make s3 ingress annotations consistent --- k8s/charts/seaweedfs/templates/s3-ingress.yaml | 4 ++-- k8s/charts/seaweedfs/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/charts/seaweedfs/templates/s3-ingress.yaml b/k8s/charts/seaweedfs/templates/s3-ingress.yaml index 7b279793b..08d58f662 100644 --- a/k8s/charts/seaweedfs/templates/s3-ingress.yaml +++ b/k8s/charts/seaweedfs/templates/s3-ingress.yaml @@ -10,9 +10,9 @@ kind: Ingress metadata: name: ingress-{{ template "seaweedfs.name" . }}-s3 namespace: {{ .Release.Namespace }} - {{- with .Values.s3.ingress.annotations }} + {{- if .Values.s3.ingress.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl .Values.s3.ingress.annotations . | nindent 4 }} {{- end }} labels: app.kubernetes.io/name: {{ template "seaweedfs.name" . }} diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index c51b2eb3e..676d0ca6f 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -746,7 +746,7 @@ s3: # host: false for "*" hostname host: "seaweedfs.cluster.local" # additional ingress annotations for the s3 endpoint - annotations: [] + annotations: "" tls: [] certificates: