Fix inconsistent admin argument in worker pods (#8316)
* Fix inconsistent admin argument in worker pods * Use seaweedfs.componentName for admin service naming
This commit is contained in:
@@ -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 }} \
|
||||||
|
|||||||
Reference in New Issue
Block a user