Browse Source

fix annotations templating for s3.ingress.annotations and document it and s3.ingress.tls in values.yaml

pull/5027/head
jessebot 1 year ago
committed by Chris Lu
parent
commit
06434f5227
  1. 2
      k8s/charts/seaweedfs/Chart.yaml
  2. 6
      k8s/charts/seaweedfs/templates/s3-ingress.yaml
  3. 3
      k8s/charts/seaweedfs/values.yaml

2
k8s/charts/seaweedfs/Chart.yaml

@ -2,4 +2,4 @@ apiVersion: v1
description: SeaweedFS description: SeaweedFS
name: seaweedfs name: seaweedfs
appVersion: "3.59" appVersion: "3.59"
version: 3.59.0
version: 3.59.1

6
k8s/charts/seaweedfs/templates/s3-ingress.yaml

@ -10,9 +10,9 @@ kind: Ingress
metadata: metadata:
name: ingress-{{ template "seaweedfs.name" . }}-s3 name: ingress-{{ template "seaweedfs.name" . }}-s3
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- if .Values.s3.ingress.annotations }}
{{- with .Values.s3.ingress.annotations }}
annotations: annotations:
{{ tpl .Values.s3.ingress.annotations . | nindent 4 | trim }}
{{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
labels: labels:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@ -43,4 +43,4 @@ spec:
{{- if .Values.s3.ingress.host }} {{- if .Values.s3.ingress.host }}
host: {{ .Values.s3.ingress.host }} host: {{ .Values.s3.ingress.host }}
{{- end }} {{- end }}
{{- end }}
{{- end }}

3
k8s/charts/seaweedfs/values.yaml

@ -641,6 +641,9 @@ s3:
className: "nginx" className: "nginx"
# host: false for "*" hostname # host: false for "*" hostname
host: "seaweedfs.cluster.local" host: "seaweedfs.cluster.local"
# additional ingress annotations for the s3 endpoint
annotations: []
tls: []
certificates: certificates:
commonName: "SeaweedFS CA" commonName: "SeaweedFS CA"

Loading…
Cancel
Save