0443b66a75
* fix(helm): trim whitespace before s3 TLS args to prevent command breakage (#8613) When global.enableSecurity is enabled, the `{{ include }}` call for s3 TLS args lacked the leading dash (`{{-`), producing an extra blank line in the rendered shell command. This broke shell continuation and caused the filer (and s3/all-in-one) to crash because arguments after the blank line were silently dropped. * ci(helm): assert no blank lines in security+S3 command blocks Renders the chart with global.enableSecurity=true and S3 enabled for normal mode (filer + s3 deployments) and all-in-one mode, then parses every /bin/sh -ec command block and fails if any contains blank lines. This catches the whitespace regression from #8613 where a missing {{- dash on the seaweedfs.s3.tlsArgs include produced a blank line that broke shell continuation. * ci(helm): enable S3 in all-in-one security render test The s3.tlsArgs include is gated by allInOne.s3.enabled, so without this flag the all-in-one command block wasn't actually exercising the TLS args path.
278 lines
11 KiB
YAML
278 lines
11 KiB
YAML
{{- if .Values.s3.enabled }}
|
|
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
name: {{ include "seaweedfs.fullname" . }}-s3
|
|
namespace: {{ .Release.Namespace }}
|
|
labels:
|
|
app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
|
|
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
|
app.kubernetes.io/component: s3
|
|
{{- if .Values.s3.annotations }}
|
|
annotations:
|
|
{{- toYaml .Values.s3.annotations | nindent 4 }}
|
|
{{- end }}
|
|
spec:
|
|
replicas: {{ .Values.s3.replicas }}
|
|
selector:
|
|
matchLabels:
|
|
app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
|
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
|
app.kubernetes.io/component: s3
|
|
template:
|
|
metadata:
|
|
labels:
|
|
app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
|
|
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
|
app.kubernetes.io/component: s3
|
|
{{ with .Values.podLabels }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.s3.podLabels }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
annotations:
|
|
{{ with .Values.podAnnotations }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.s3.podAnnotations }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
spec:
|
|
restartPolicy: {{ default .Values.global.restartPolicy .Values.s3.restartPolicy }}
|
|
{{- if .Values.s3.affinity }}
|
|
affinity:
|
|
{{ tpl .Values.s3.affinity . | nindent 8 | trim }}
|
|
{{- end }}
|
|
{{- if .Values.s3.topologySpreadConstraints }}
|
|
topologySpreadConstraints:
|
|
{{ tpl .Values.s3.topologySpreadConstraints . | nindent 8 | trim }}
|
|
{{- end }}
|
|
{{- if .Values.s3.tolerations }}
|
|
tolerations:
|
|
{{ tpl .Values.s3.tolerations . | nindent 8 | trim }}
|
|
{{- end }}
|
|
{{- include "seaweedfs.imagePullSecrets" . | nindent 6 }}
|
|
terminationGracePeriodSeconds: 10
|
|
{{- if .Values.s3.priorityClassName }}
|
|
priorityClassName: {{ .Values.s3.priorityClassName | quote }}
|
|
{{- end }}
|
|
enableServiceLinks: false
|
|
{{- if .Values.s3.serviceAccountName }}
|
|
serviceAccountName: {{ .Values.s3.serviceAccountName | quote }}
|
|
{{- end }}
|
|
{{- if .Values.s3.initContainers }}
|
|
initContainers:
|
|
{{ tpl .Values.s3.initContainers . | nindent 8 | trim }}
|
|
{{- end }}
|
|
{{- if .Values.s3.podSecurityContext.enabled }}
|
|
securityContext: {{- omit .Values.s3.podSecurityContext "enabled" | toYaml | nindent 8 }}
|
|
{{- end }}
|
|
containers:
|
|
- name: seaweedfs
|
|
image: {{ template "s3.image" . }}
|
|
imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
|
|
env:
|
|
- name: POD_IP
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: status.podIP
|
|
- name: POD_NAME
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: metadata.name
|
|
- name: NAMESPACE
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: metadata.namespace
|
|
- name: SEAWEEDFS_FULLNAME
|
|
value: "{{ include "seaweedfs.fullname" . }}"
|
|
{{- $mergedExtraEnvironmentVars := dict }}
|
|
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global "component" .Values.s3 "target" $mergedExtraEnvironmentVars) }}
|
|
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
|
|
{{- $value := index $mergedExtraEnvironmentVars $key }}
|
|
- name: {{ $key }}
|
|
{{- if kindIs "string" $value }}
|
|
value: {{ tpl $value $ | quote }}
|
|
{{- else }}
|
|
valueFrom:
|
|
{{ toYaml $value | nindent 16 | trim }}
|
|
{{- end -}}
|
|
{{- end }}
|
|
command:
|
|
- "/bin/sh"
|
|
- "-ec"
|
|
- |
|
|
exec /usr/bin/weed \
|
|
{{- if or (eq .Values.s3.logs.type "hostPath") (eq .Values.s3.logs.type "emptyDir") }}
|
|
-logdir=/logs \
|
|
{{- else }}
|
|
-logtostderr=true \
|
|
{{- end }}
|
|
{{- if .Values.s3.loggingOverrideLevel }}
|
|
-v={{ .Values.s3.loggingOverrideLevel }} \
|
|
{{- else }}
|
|
-v={{ .Values.global.loggingLevel }} \
|
|
{{- end }}
|
|
s3 \
|
|
-ip.bind={{ .Values.s3.bindAddress }} \
|
|
-port={{ .Values.s3.port }} \
|
|
{{- if .Values.s3.metricsPort }}
|
|
-metricsPort {{ .Values.s3.metricsPort }} \
|
|
{{- end }}
|
|
{{- if .Values.global.enableSecurity }}
|
|
{{- if .Values.s3.httpsPort }}
|
|
-port.https={{ .Values.s3.httpsPort }} \
|
|
{{- end }}
|
|
{{- include "seaweedfs.s3.tlsArgs" (dict "root" . "prefix" "") | nindent 14 }}
|
|
{{- end }}
|
|
{{- if .Values.s3.domainName }}
|
|
-domainName={{ .Values.s3.domainName }} \
|
|
{{- end }}
|
|
{{- if .Values.s3.enableAuth }}
|
|
-config=/etc/sw/seaweedfs_s3_config \
|
|
{{- end }}
|
|
{{- if .Values.s3.auditLogConfig }}
|
|
-auditLogConfig=/etc/sw/s3_auditLogConfig.json \
|
|
{{- end }}
|
|
-filer={{ include "seaweedfs.componentName" (list . "filer-client") }}.{{ .Release.Namespace }}:{{ .Values.filer.port }} \
|
|
{{- if .Values.s3.icebergPort }}
|
|
-port.iceberg={{ .Values.s3.icebergPort }} \
|
|
{{- end }}
|
|
{{- range .Values.s3.extraArgs }}
|
|
{{ . }} \
|
|
{{- end }}
|
|
volumeMounts:
|
|
{{- if or (eq .Values.s3.logs.type "hostPath") (eq .Values.s3.logs.type "emptyDir") }}
|
|
- name: logs
|
|
mountPath: "/logs/"
|
|
{{- end }}
|
|
{{- if .Values.s3.enableAuth }}
|
|
- mountPath: /etc/sw
|
|
name: config-users
|
|
readOnly: true
|
|
{{- end }}
|
|
{{- if .Values.global.enableSecurity }}
|
|
- name: security-config
|
|
readOnly: true
|
|
mountPath: /etc/seaweedfs/security.toml
|
|
subPath: security.toml
|
|
- name: ca-cert
|
|
readOnly: true
|
|
mountPath: /usr/local/share/ca-certificates/ca/
|
|
- name: master-cert
|
|
readOnly: true
|
|
mountPath: /usr/local/share/ca-certificates/master/
|
|
- name: volume-cert
|
|
readOnly: true
|
|
mountPath: /usr/local/share/ca-certificates/volume/
|
|
- name: filer-cert
|
|
readOnly: true
|
|
mountPath: /usr/local/share/ca-certificates/filer/
|
|
- name: client-cert
|
|
readOnly: true
|
|
mountPath: /usr/local/share/ca-certificates/client/
|
|
{{- include "seaweedfs.s3.tlsVolumeMount" . | nindent 12 }}
|
|
{{- end }}
|
|
{{ tpl .Values.s3.extraVolumeMounts . | nindent 12 | trim }}
|
|
ports:
|
|
- containerPort: {{ .Values.s3.port }}
|
|
name: swfs-s3
|
|
{{- if .Values.s3.httpsPort }}
|
|
- containerPort: {{ .Values.s3.httpsPort }}
|
|
name: swfs-s3-tls
|
|
{{- end }}
|
|
{{- if .Values.s3.icebergPort }}
|
|
- containerPort: {{ .Values.s3.icebergPort }}
|
|
name: swfs-iceberg
|
|
{{- end }}
|
|
{{- if .Values.s3.metricsPort }}
|
|
- containerPort: {{ .Values.s3.metricsPort }}
|
|
name: metrics
|
|
{{- end }}
|
|
{{- if .Values.s3.readinessProbe.enabled }}
|
|
readinessProbe:
|
|
httpGet:
|
|
path: {{ .Values.s3.readinessProbe.httpGet.path }}
|
|
port: {{ .Values.s3.port }}
|
|
scheme: {{ .Values.s3.readinessProbe.httpGet.scheme }}
|
|
initialDelaySeconds: {{ .Values.s3.readinessProbe.initialDelaySeconds }}
|
|
periodSeconds: {{ .Values.s3.readinessProbe.periodSeconds }}
|
|
successThreshold: {{ .Values.s3.readinessProbe.successThreshold }}
|
|
failureThreshold: {{ .Values.s3.readinessProbe.failureThreshold }}
|
|
timeoutSeconds: {{ .Values.s3.readinessProbe.timeoutSeconds }}
|
|
{{- end }}
|
|
{{- if .Values.s3.livenessProbe.enabled }}
|
|
livenessProbe:
|
|
httpGet:
|
|
path: {{ .Values.s3.livenessProbe.httpGet.path }}
|
|
port: {{ .Values.s3.port }}
|
|
scheme: {{ .Values.s3.livenessProbe.httpGet.scheme }}
|
|
initialDelaySeconds: {{ .Values.s3.livenessProbe.initialDelaySeconds }}
|
|
periodSeconds: {{ .Values.s3.livenessProbe.periodSeconds }}
|
|
successThreshold: {{ .Values.s3.livenessProbe.successThreshold }}
|
|
failureThreshold: {{ .Values.s3.livenessProbe.failureThreshold }}
|
|
timeoutSeconds: {{ .Values.s3.livenessProbe.timeoutSeconds }}
|
|
{{- end }}
|
|
{{- with .Values.s3.resources }}
|
|
resources:
|
|
{{- toYaml . | nindent 12 }}
|
|
{{- end }}
|
|
{{- if .Values.s3.containerSecurityContext.enabled }}
|
|
securityContext: {{- omit .Values.s3.containerSecurityContext "enabled" | toYaml | nindent 12 }}
|
|
{{- end }}
|
|
{{- if .Values.s3.sidecars }}
|
|
{{- include "common.tplvalues.render" (dict "value" .Values.s3.sidecars "context" $) | nindent 8 }}
|
|
{{- end }}
|
|
volumes:
|
|
{{- if .Values.s3.enableAuth }}
|
|
- name: config-users
|
|
secret:
|
|
defaultMode: 420
|
|
{{- if .Values.s3.existingConfigSecret }}
|
|
secretName: {{ .Values.s3.existingConfigSecret }}
|
|
{{- else }}
|
|
secretName: {{ include "seaweedfs.fullname" . }}-s3-secret
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if eq .Values.s3.logs.type "hostPath" }}
|
|
- name: logs
|
|
hostPath:
|
|
path: {{ .Values.s3.logs.hostPathPrefix }}/logs/seaweedfs/s3
|
|
type: DirectoryOrCreate
|
|
{{- end }}
|
|
{{- if eq .Values.s3.logs.type "emptyDir" }}
|
|
- name: logs
|
|
emptyDir: {}
|
|
{{- end }}
|
|
{{- if .Values.global.enableSecurity }}
|
|
- name: security-config
|
|
configMap:
|
|
name: {{ include "seaweedfs.fullname" . }}-security-config
|
|
- name: ca-cert
|
|
secret:
|
|
secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
|
|
- name: master-cert
|
|
secret:
|
|
secretName: {{ include "seaweedfs.fullname" . }}-master-cert
|
|
- name: volume-cert
|
|
secret:
|
|
secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
|
|
- name: filer-cert
|
|
secret:
|
|
secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
|
|
- name: client-cert
|
|
secret:
|
|
secretName: {{ include "seaweedfs.fullname" . }}-client-cert
|
|
{{- include "seaweedfs.s3.tlsVolume" . | nindent 8 }}
|
|
{{- end }}
|
|
{{ tpl .Values.s3.extraVolumes . | indent 8 | trim }}
|
|
{{- if .Values.s3.nodeSelector }}
|
|
nodeSelector:
|
|
{{ tpl .Values.s3.nodeSelector . | indent 8 | trim }}
|
|
{{- end }}
|
|
{{- end }}
|