Browse Source
Merge pull request #1603 from LazyDBA247-Anyvision/master
Chart Fix
pull/1610/head
Chris Lu
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with
8 additions and
8 deletions
-
k8s/seaweedfs/templates/filer-statefulset.yaml
-
k8s/seaweedfs/templates/s3-deployment.yaml
-
k8s/seaweedfs/templates/s3-service.yaml
-
k8s/seaweedfs/templates/s3-servicemonitor.yaml
-
k8s/seaweedfs/templates/volume-service.yaml
-
k8s/seaweedfs/templates/volume-servicemonitor.yaml
-
k8s/seaweedfs/templates/volume-statefulset.yaml
|
|
@ -101,7 +101,7 @@ spec: |
|
|
-port={{ .Values.filer.port }} \ |
|
|
-port={{ .Values.filer.port }} \ |
|
|
{{- if .Values.filer.metricsPort }} |
|
|
{{- if .Values.filer.metricsPort }} |
|
|
-metricsPort {{ .Values.filer.metricsPort }} \ |
|
|
-metricsPort {{ .Values.filer.metricsPort }} \ |
|
|
{{- end }}} |
|
|
|
|
|
|
|
|
{{- end }} |
|
|
{{- if .Values.filer.redirectOnRead }} |
|
|
{{- if .Values.filer.redirectOnRead }} |
|
|
-redirectOnRead \ |
|
|
-redirectOnRead \ |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
|
|
|
@ -73,7 +73,7 @@ spec: |
|
|
-port={{ .Values.s3.port }} \ |
|
|
-port={{ .Values.s3.port }} \ |
|
|
{{- if .Values.s3.metricsPort }} |
|
|
{{- if .Values.s3.metricsPort }} |
|
|
-metricsPort {{ .Values.s3.metricsPort }} \ |
|
|
-metricsPort {{ .Values.s3.metricsPort }} \ |
|
|
{{- end }}} |
|
|
|
|
|
|
|
|
{{- end }} |
|
|
{{- if .Values.global.enableSecurity }} |
|
|
{{- if .Values.global.enableSecurity }} |
|
|
-cert.file=/usr/local/share/ca-certificates/client/tls.crt \ |
|
|
-cert.file=/usr/local/share/ca-certificates/client/tls.crt \ |
|
|
-key.file=/usr/local/share/ca-certificates/client/tls.key \ |
|
|
-key.file=/usr/local/share/ca-certificates/client/tls.key \ |
|
|
|
|
|
@ -14,10 +14,10 @@ spec: |
|
|
protocol: TCP |
|
|
protocol: TCP |
|
|
{{- if .Values.s3.metricsPort }} |
|
|
{{- if .Values.s3.metricsPort }} |
|
|
- name: "swfs-s3-metrics" |
|
|
- name: "swfs-s3-metrics" |
|
|
port: {{ .Values.filer.s3 }} |
|
|
|
|
|
|
|
|
port: {{ .Values.s3.metricsPort }} |
|
|
targetPort: {{ .Values.s3.metricsPort }} |
|
|
targetPort: {{ .Values.s3.metricsPort }} |
|
|
protocol: TCP |
|
|
protocol: TCP |
|
|
{{- end }}} |
|
|
|
|
|
|
|
|
{{- end }} |
|
|
selector: |
|
|
selector: |
|
|
app: {{ template "seaweedfs.name" . }} |
|
|
app: {{ template "seaweedfs.name" . }} |
|
|
component: s3 |
|
|
component: s3 |
|
|
@ -15,4 +15,4 @@ spec: |
|
|
selector: |
|
|
selector: |
|
|
app: {{ template "seaweedfs.name" . }} |
|
|
app: {{ template "seaweedfs.name" . }} |
|
|
component: s3 |
|
|
component: s3 |
|
|
{{- end }}} |
|
|
|
|
|
|
|
|
{{- end }} |
|
|
@ -22,7 +22,7 @@ spec: |
|
|
port: {{ .Values.volume.metricsPort }} |
|
|
port: {{ .Values.volume.metricsPort }} |
|
|
targetPort: {{ .Values.volume.metricsPort }} |
|
|
targetPort: {{ .Values.volume.metricsPort }} |
|
|
protocol: TCP |
|
|
protocol: TCP |
|
|
{{- end }}} |
|
|
|
|
|
|
|
|
{{- end }} |
|
|
selector: |
|
|
selector: |
|
|
app: {{ template "seaweedfs.name" . }} |
|
|
app: {{ template "seaweedfs.name" . }} |
|
|
component: volume |
|
|
component: volume |
|
|
@ -15,4 +15,4 @@ spec: |
|
|
selector: |
|
|
selector: |
|
|
app: {{ template "seaweedfs.name" . }} |
|
|
app: {{ template "seaweedfs.name" . }} |
|
|
component: volume |
|
|
component: volume |
|
|
{{- end }}} |
|
|
|
|
|
|
|
|
{{- end }} |
|
|
@ -78,7 +78,7 @@ spec: |
|
|
-port={{ .Values.volume.port }} \ |
|
|
-port={{ .Values.volume.port }} \ |
|
|
{{- if .Values.volume.metricsPort }} |
|
|
{{- if .Values.volume.metricsPort }} |
|
|
-metricsPort {{ .Values.volume.metricsPort }} \ |
|
|
-metricsPort {{ .Values.volume.metricsPort }} \ |
|
|
{{- end }}} |
|
|
|
|
|
|
|
|
{{- end }} |
|
|
-dir={{ .Values.volume.dir }} \ |
|
|
-dir={{ .Values.volume.dir }} \ |
|
|
-max={{ .Values.volume.maxVolumes }} \ |
|
|
-max={{ .Values.volume.maxVolumes }} \ |
|
|
{{- if .Values.volume.rack }} |
|
|
{{- if .Values.volume.rack }} |
|
|
|
