Browse Source

address comments

add-admin-and-worker-to-helm-charts
chrislu 1 month ago
parent
commit
522d933b2f
  1. 9
      k8s/charts/seaweedfs/templates/admin/admin-ingress.yaml
  2. 1
      k8s/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml
  3. 3
      k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml
  4. 3
      k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml
  5. 1
      k8s/charts/seaweedfs/values.yaml

9
k8s/charts/seaweedfs/templates/admin/admin-ingress.yaml

@ -25,7 +25,10 @@ spec:
tls: tls:
{{ .Values.admin.ingress.tls | default list | toYaml | nindent 6}} {{ .Values.admin.ingress.tls | default list | toYaml | nindent 6}}
rules: rules:
- http:
- {{- if .Values.admin.ingress.host }}
host: {{ .Values.admin.ingress.host | quote }}
{{- end }}
http:
paths: paths:
- path: {{ .Values.admin.ingress.path | quote }} - path: {{ .Values.admin.ingress.path | quote }}
pathType: {{ .Values.admin.ingress.pathType | quote }} pathType: {{ .Values.admin.ingress.pathType | quote }}
@ -40,8 +43,4 @@ spec:
serviceName: {{ template "seaweedfs.name" . }}-admin serviceName: {{ template "seaweedfs.name" . }}-admin
servicePort: {{ .Values.admin.port }} servicePort: {{ .Values.admin.port }}
{{- end }} {{- end }}
{{- if .Values.admin.ingress.host }}
host: {{ .Values.admin.ingress.host | quote }}
{{- end }}
{{- end }} {{- end }}

1
k8s/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml

@ -31,4 +31,3 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

3
k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml

@ -119,7 +119,7 @@ spec:
- "-ec" - "-ec"
- | - |
exec /usr/bin/weed \ 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 \ -logdir=/logs \
{{- else }} {{- else }}
-logtostderr=true \ -logtostderr=true \
@ -314,4 +314,3 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

3
k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml

@ -117,7 +117,7 @@ spec:
- "-ec" - "-ec"
- | - |
exec /usr/bin/weed \ 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 \ -logdir=/logs \
{{- else }} {{- else }}
-logtostderr=true \ -logtostderr=true \
@ -242,4 +242,3 @@ spec:
{{ tpl .Values.worker.nodeSelector . | indent 8 | trim }} {{ tpl .Values.worker.nodeSelector . | indent 8 | trim }}
{{- end }} {{- end }}
{{- end }} {{- end }}

1
k8s/charts/seaweedfs/values.yaml

@ -1095,7 +1095,6 @@ admin:
imageOverride: null imageOverride: null
restartPolicy: null restartPolicy: null
replicas: 1 replicas: 1
bindAddress: 0.0.0.0
port: 23646 # Default admin port port: 23646 # Default admin port
grpcPort: 33646 # Default gRPC port for worker connections grpcPort: 33646 # Default gRPC port for worker connections
metricsPort: 9327 metricsPort: 9327

Loading…
Cancel
Save