[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
3 changed files with 12 additions and 4 deletions

View File

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

View File

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

View File

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