helm chart: make s3 ingress annotations consistent (#5463)

Make s3 ingress annotations consistent
2024-04-03 17:09:34 +01:00
parent b4def8f000
commit 881c922972
2 changed files with 3 additions and 3 deletions
--- 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" . }}
--- 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: