[helm] fix log to stderr and default host for ingress (#4787)

This commit is contained in:
Dmitriy Pavlov 2023-08-27 23:53:28 +03:00 committed by GitHub
parent 796b7508f3
commit 3d45ecd326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions

View file

@ -17,8 +17,7 @@ spec:
tls:
{{ .Values.filer.ingress.tls | default list | toYaml | nindent 6}}
rules:
- host: {{ .Values.filer.ingress.host }}
http:
- http:
paths:
- path: /sw-filer/?(.*)
pathType: ImplementationSpecific
@ -33,6 +32,9 @@ spec:
serviceName: {{ template "seaweedfs.name" . }}-filer
servicePort: {{ .Values.filer.port }}
{{- end }}
{{- if .Values.filer.ingress.host }}
host: {{ .Values.filer.ingress.host }}
{{- end }}
{{- end }}
---
{{- if .Values.master.ingress.enabled }}
@ -52,8 +54,7 @@ metadata:
spec:
ingressClassName: {{ .Values.master.ingress.className | quote }}
rules:
- host: {{ .Values.master.ingress.host }}
http:
- http:
paths:
- path: /sw-master/?(.*)
pathType: ImplementationSpecific
@ -68,4 +69,7 @@ spec:
serviceName: {{ template "seaweedfs.name" . }}-master
servicePort: {{ .Values.master.port }}
{{- end }}
{{- if .Values.filer.ingress.host }}
host: {{ .Values.master.ingress.host }}
{{- end }}
{{- end }}

View file

@ -107,8 +107,10 @@ spec:
{{- end }}
-filer={{ template "seaweedfs.name" . }}-filer-client.{{ .Release.Namespace }}:{{ .Values.filer.port }}
volumeMounts:
{{- if eq .Values.s3.logs.type "hostPath" }}
- name: logs
mountPath: "/logs/"
{{- end }}
- mountPath: /etc/sw
name: config-users
readOnly: true

View file

@ -127,6 +127,7 @@ master:
ingress:
enabled: false
className: "nginx"
# host: false for "*" hostname
host: "master.seaweedfs.local"
annotations:
nginx.ingress.kubernetes.io/auth-type: "basic"
@ -375,6 +376,7 @@ filer:
ingress:
enabled: false
className: "nginx"
# host: false for "*" hostname
host: "seaweedfs.cluster.local"
annotations:
nginx.ingress.kubernetes.io/backend-protocol: GRPC