diff options
| author | chrislu <chris.lu@gmail.com> | 2024-04-08 11:03:14 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-04-08 11:03:14 -0700 |
| commit | cc1c69f312a967dfb636a677db910eb64ab65a06 (patch) | |
| tree | 086fa2b7ce6e7b80c4a00516cba2810655579709 /k8s/charts | |
| parent | ccdd9cd8decf66089ac201b7c2ca1f5889582b93 (diff) | |
| parent | f08f95ac800b788e42290e58eb6444e094acf97f (diff) | |
| download | seaweedfs-cc1c69f312a967dfb636a677db910eb64ab65a06.tar.xz seaweedfs-cc1c69f312a967dfb636a677db910eb64ab65a06.zip | |
Merge branch 'master' into mq-subscribe
Diffstat (limited to 'k8s/charts')
| -rw-r--r-- | k8s/charts/seaweedfs/templates/s3-ingress.yaml | 4 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/values.yaml | 6 |
2 files changed, 5 insertions, 5 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 9381f9046..676d0ca6f 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -293,9 +293,9 @@ volume: # same applies to "logs" - idx: "" + idx: {} - logs: "" + logs: {} # limit background compaction or copying speed in mega bytes per second compactionMBps: "50" @@ -746,7 +746,7 @@ s3: # host: false for "*" hostname host: "seaweedfs.cluster.local" # additional ingress annotations for the s3 endpoint - annotations: [] + annotations: "" tls: [] certificates: |