aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormergwyn <gary@theclarkhome.com>2024-04-03 17:09:34 +0100
committerGitHub <noreply@github.com>2024-04-03 09:09:34 -0700
commit881c9229720d9556cc8d5cf13ec8d9b7275b5b86 (patch)
treeb84da889520b8585fba722a6c42a5a00001b5154
parentb4def8f0007f63dc6cb4a1be7109b4af2461bd68 (diff)
downloadseaweedfs-881c9229720d9556cc8d5cf13ec8d9b7275b5b86.tar.xz
seaweedfs-881c9229720d9556cc8d5cf13ec8d9b7275b5b86.zip
helm chart: make s3 ingress annotations consistent (#5463)
Make s3 ingress annotations consistent
-rw-r--r--k8s/charts/seaweedfs/templates/s3-ingress.yaml4
-rw-r--r--k8s/charts/seaweedfs/values.yaml2
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: