diff --git a/k8s/charts/seaweedfs/templates/admin/admin-ingress.yaml b/k8s/charts/seaweedfs/templates/admin/admin-ingress.yaml index c4f7efdf9..b1972217d 100644 --- a/k8s/charts/seaweedfs/templates/admin/admin-ingress.yaml +++ b/k8s/charts/seaweedfs/templates/admin/admin-ingress.yaml @@ -25,7 +25,10 @@ spec: tls: {{ .Values.admin.ingress.tls | default list | toYaml | nindent 6}} rules: - - http: + - {{- if .Values.admin.ingress.host }} + host: {{ .Values.admin.ingress.host | quote }} + {{- end }} + http: paths: - path: {{ .Values.admin.ingress.path | quote }} pathType: {{ .Values.admin.ingress.pathType | quote }} @@ -40,8 +43,4 @@ spec: serviceName: {{ template "seaweedfs.name" . }}-admin servicePort: {{ .Values.admin.port }} {{- end }} -{{- if .Values.admin.ingress.host }} - host: {{ .Values.admin.ingress.host | quote }} -{{- end }} -{{- end }} - +{{- end }} \ No newline at end of file diff --git a/k8s/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml b/k8s/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml index 9b3d0d718..4c2c0b162 100644 --- a/k8s/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml +++ b/k8s/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml @@ -30,5 +30,4 @@ spec: app.kubernetes.io/component: admin {{- end }} {{- end }} -{{- end }} - +{{- end }} \ No newline at end of file diff --git a/k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml b/k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml index 236ec919a..f38eb83bf 100644 --- a/k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml +++ b/k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml @@ -119,7 +119,7 @@ spec: - "-ec" - | exec /usr/bin/weed \ - {{- if or (eq .Values.admin.logs.type "hostPath") (eq .Values.admin.logs.type "persistentVolumeClaim") (eq .Values.admin.logs.type "emptyDir") }} + {{- if or (eq .Values.admin.logs.type "hostPath") (eq .Values.admin.logs.type "persistentVolumeClaim") (eq .Values.admin.logs.type "emptyDir") (eq .Values.admin.logs.type "existingClaim") }} -logdir=/logs \ {{- else }} -logtostderr=true \ @@ -313,5 +313,4 @@ spec: storage: {{ .Values.admin.logs.size }} {{- end }} {{- end }} -{{- end }} - +{{- end }} \ No newline at end of file diff --git a/k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml b/k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml index 39cd00aed..a4069ab1f 100644 --- a/k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml +++ b/k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml @@ -117,7 +117,7 @@ spec: - "-ec" - | exec /usr/bin/weed \ - {{- if or (eq .Values.worker.logs.type "hostPath") (eq .Values.worker.logs.type "emptyDir") }} + {{- if or (eq .Values.worker.logs.type "hostPath") (eq .Values.worker.logs.type "emptyDir") (eq .Values.worker.logs.type "existingClaim") }} -logdir=/logs \ {{- else }} -logtostderr=true \ @@ -241,5 +241,4 @@ spec: nodeSelector: {{ tpl .Values.worker.nodeSelector . | indent 8 | trim }} {{- end }} -{{- end }} - +{{- end }} \ No newline at end of file diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index 9837bcc1f..17e6b7931 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -1095,7 +1095,6 @@ admin: imageOverride: null restartPolicy: null replicas: 1 - bindAddress: 0.0.0.0 port: 23646 # Default admin port grpcPort: 33646 # Default gRPC port for worker connections metricsPort: 9327