diff options
| author | jessebot <jessebot@linux.com> | 2023-11-18 13:26:09 +0100 |
|---|---|---|
| committer | Chris Lu <chrislusf@users.noreply.github.com> | 2023-11-18 05:20:26 -0800 |
| commit | 06434f5227d6ee89d5f7bc3367132cec9b9fdb61 (patch) | |
| tree | d6ef1905919fe4cf572250330b7574aa7d6bd14a | |
| parent | 06e723f6295726de5a4fdc18929e50d1a4898029 (diff) | |
| download | seaweedfs-06434f5227d6ee89d5f7bc3367132cec9b9fdb61.tar.xz seaweedfs-06434f5227d6ee89d5f7bc3367132cec9b9fdb61.zip | |
fix annotations templating for s3.ingress.annotations and document it and s3.ingress.tls in values.yaml
| -rw-r--r-- | k8s/charts/seaweedfs/Chart.yaml | 2 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/templates/s3-ingress.yaml | 6 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/values.yaml | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/k8s/charts/seaweedfs/Chart.yaml b/k8s/charts/seaweedfs/Chart.yaml index 79af24810..b3616e362 100644 --- a/k8s/charts/seaweedfs/Chart.yaml +++ b/k8s/charts/seaweedfs/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: SeaweedFS name: seaweedfs appVersion: "3.59" -version: 3.59.0 +version: 3.59.1 diff --git a/k8s/charts/seaweedfs/templates/s3-ingress.yaml b/k8s/charts/seaweedfs/templates/s3-ingress.yaml index 121495103..7b279793b 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 }} - {{- if .Values.s3.ingress.annotations }} + {{- with .Values.s3.ingress.annotations }} annotations: - {{ tpl .Values.s3.ingress.annotations . | nindent 4 | trim }} + {{- toYaml . | nindent 4 }} {{- end }} labels: app.kubernetes.io/name: {{ template "seaweedfs.name" . }} @@ -43,4 +43,4 @@ spec: {{- if .Values.s3.ingress.host }} host: {{ .Values.s3.ingress.host }} {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index 2884621c1..3b69d8acd 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -641,6 +641,9 @@ s3: className: "nginx" # host: false for "*" hostname host: "seaweedfs.cluster.local" + # additional ingress annotations for the s3 endpoint + annotations: [] + tls: [] certificates: commonName: "SeaweedFS CA" |