mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
chart with optional https port for s3 (#4507)
https://github.com/seaweedfs/seaweedfs/pull/4482 Co-authored-by: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.co>
This commit is contained in:
parent
a82c44972b
commit
0515014149
|
@ -25,6 +25,12 @@ spec:
|
||||||
port: {{ .Values.filer.s3.port }}
|
port: {{ .Values.filer.s3.port }}
|
||||||
targetPort: {{ .Values.filer.s3.port }}
|
targetPort: {{ .Values.filer.s3.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
{{- if .Values.filer.s3.httpsPort }}
|
||||||
|
- name: "swfs-s3-tls"
|
||||||
|
port: {{ .Values.filer.s3.httpsPort }}
|
||||||
|
targetPort: {{ .Values.filer.s3.httpsPort }}
|
||||||
|
protocol: TCP
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.filer.metricsPort }}
|
{{- if .Values.filer.metricsPort }}
|
||||||
- name: "metrics"
|
- name: "metrics"
|
||||||
|
|
|
@ -163,6 +163,9 @@ spec:
|
||||||
-s3.domainName={{ .Values.filer.s3.domainName }} \
|
-s3.domainName={{ .Values.filer.s3.domainName }} \
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.global.enableSecurity }}
|
{{- if .Values.global.enableSecurity }}
|
||||||
|
{{- if .Values.filer.s3.httpsPort }}
|
||||||
|
-s3.port.https={{ .Values.filer.s3.httpsPort }} \
|
||||||
|
{{- end }}
|
||||||
-s3.cert.file=/usr/local/share/ca-certificates/client/tls.crt \
|
-s3.cert.file=/usr/local/share/ca-certificates/client/tls.crt \
|
||||||
-s3.key.file=/usr/local/share/ca-certificates/client/tls.key \
|
-s3.key.file=/usr/local/share/ca-certificates/client/tls.key \
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -90,6 +90,9 @@ spec:
|
||||||
-metricsPort {{ .Values.s3.metricsPort }} \
|
-metricsPort {{ .Values.s3.metricsPort }} \
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.global.enableSecurity }}
|
{{- if .Values.global.enableSecurity }}
|
||||||
|
{{- if .Values.s3.httpsPort }}
|
||||||
|
-port.https={{ .Values.s3.httpsPort }} \
|
||||||
|
{{- end }}
|
||||||
-cert.file=/usr/local/share/ca-certificates/client/tls.crt \
|
-cert.file=/usr/local/share/ca-certificates/client/tls.crt \
|
||||||
-key.file=/usr/local/share/ca-certificates/client/tls.key \
|
-key.file=/usr/local/share/ca-certificates/client/tls.key \
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -12,6 +12,12 @@ spec:
|
||||||
port: {{ if .Values.s3.enabled }}{{ .Values.s3.port }}{{ else }}{{ .Values.filer.s3.port }}{{ end }}
|
port: {{ if .Values.s3.enabled }}{{ .Values.s3.port }}{{ else }}{{ .Values.filer.s3.port }}{{ end }}
|
||||||
targetPort: {{ if .Values.s3.enabled }}{{ .Values.s3.port }}{{ else }}{{ .Values.filer.s3.port }}{{ end }}
|
targetPort: {{ if .Values.s3.enabled }}{{ .Values.s3.port }}{{ else }}{{ .Values.filer.s3.port }}{{ end }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
{{- if and .Values.s3.enabled .Values.s3.httpsPort }}
|
||||||
|
- name: "swfs-s3-tls"
|
||||||
|
port: {{ .Values.s3.httpsPort }}
|
||||||
|
targetPort: {{ .Values.s3.httpsPort }}
|
||||||
|
protocol: TCP
|
||||||
|
{{- end }}
|
||||||
{{- if and .Values.s3.enabled .Values.s3.metricsPort }}
|
{{- if and .Values.s3.enabled .Values.s3.metricsPort }}
|
||||||
- name: "metrics"
|
- name: "metrics"
|
||||||
port: {{ .Values.s3.metricsPort }}
|
port: {{ .Values.s3.metricsPort }}
|
||||||
|
|
|
@ -428,6 +428,8 @@ filer:
|
||||||
s3:
|
s3:
|
||||||
enabled: true
|
enabled: true
|
||||||
port: 8333
|
port: 8333
|
||||||
|
# add additional https port
|
||||||
|
httpsPort: 0
|
||||||
# allow empty folders
|
# allow empty folders
|
||||||
allowEmptyFolder: false
|
allowEmptyFolder: false
|
||||||
# Suffix of the host name, {bucket}.{domainName}
|
# Suffix of the host name, {bucket}.{domainName}
|
||||||
|
@ -446,6 +448,8 @@ s3:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
bindAddress: 0.0.0.0
|
bindAddress: 0.0.0.0
|
||||||
port: 8333
|
port: 8333
|
||||||
|
# add additional https port
|
||||||
|
httpsPort: 0
|
||||||
metricsPort: 9327
|
metricsPort: 9327
|
||||||
loggingOverrideLevel: null
|
loggingOverrideLevel: null
|
||||||
# allow empty folders
|
# allow empty folders
|
||||||
|
|
Loading…
Reference in a new issue