Browse Source
Fix inconsistent admin argument in worker pods (#8316)
* Fix inconsistent admin argument in worker pods
* Use seaweedfs.componentName for admin service naming
pull/8321/head
Chris Lu
1 week ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
2 additions and
2 deletions
-
k8s/charts/seaweedfs/templates/admin/admin-service.yaml
-
k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml
|
|
@ -2,7 +2,7 @@ |
|
|
apiVersion: v1 |
|
|
apiVersion: v1 |
|
|
kind: Service |
|
|
kind: Service |
|
|
metadata: |
|
|
metadata: |
|
|
name: {{ printf "%s-admin" (include "seaweedfs.fullname" .) | trunc 63 | trimSuffix "-" }} |
|
|
|
|
|
|
|
|
name: {{ include "seaweedfs.componentName" (list . "admin") }} |
|
|
namespace: {{ .Release.Namespace }} |
|
|
namespace: {{ .Release.Namespace }} |
|
|
labels: |
|
|
labels: |
|
|
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} |
|
|
app.kubernetes.io/name: {{ template "seaweedfs.name" . }} |
|
|
|
|
|
@ -134,7 +134,7 @@ spec: |
|
|
{{- if .Values.worker.adminServer }} |
|
|
{{- if .Values.worker.adminServer }} |
|
|
-admin={{ .Values.worker.adminServer }} \ |
|
|
-admin={{ .Values.worker.adminServer }} \ |
|
|
{{- else }} |
|
|
{{- else }} |
|
|
-admin={{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}:{{ .Values.admin.port }}{{ if .Values.admin.grpcPort }}.{{ .Values.admin.grpcPort }}{{ end }} \ |
|
|
|
|
|
|
|
|
-admin={{ include "seaweedfs.componentName" (list . "admin") }}.{{ .Release.Namespace }}:{{ .Values.admin.port }}{{ if .Values.admin.grpcPort }}.{{ .Values.admin.grpcPort }}{{ end }} \ |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
-capabilities={{ .Values.worker.capabilities }} \ |
|
|
-capabilities={{ .Values.worker.capabilities }} \ |
|
|
-maxConcurrent={{ .Values.worker.maxConcurrent }} \ |
|
|
-maxConcurrent={{ .Values.worker.maxConcurrent }} \ |
|
|
|
