diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-11-07 17:21:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 17:21:42 -0800 |
| commit | be2bf1f102f866c85aee66b5f02025e1ca923cc3 (patch) | |
| tree | 9b37eed8ad4a324b16bde81d359650f2bc66f59a | |
| parent | 2b6fdebd5edfa897dfb3326118b25644424fd964 (diff) | |
| parent | e7e3d8df7c1d9c9d356339aacfa50afba8884372 (diff) | |
| download | seaweedfs-be2bf1f102f866c85aee66b5f02025e1ca923cc3.tar.xz seaweedfs-be2bf1f102f866c85aee66b5f02025e1ca923cc3.zip | |
Merge pull request #1603 from LazyDBA247-Anyvision/master
Chart Fix
| -rw-r--r-- | k8s/seaweedfs/templates/filer-statefulset.yaml | 2 | ||||
| -rw-r--r-- | k8s/seaweedfs/templates/s3-deployment.yaml | 2 | ||||
| -rw-r--r-- | k8s/seaweedfs/templates/s3-service.yaml | 4 | ||||
| -rw-r--r-- | k8s/seaweedfs/templates/s3-servicemonitor.yaml | 2 | ||||
| -rw-r--r-- | k8s/seaweedfs/templates/volume-service.yaml | 2 | ||||
| -rw-r--r-- | k8s/seaweedfs/templates/volume-servicemonitor.yaml | 2 | ||||
| -rw-r--r-- | k8s/seaweedfs/templates/volume-statefulset.yaml | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/k8s/seaweedfs/templates/filer-statefulset.yaml b/k8s/seaweedfs/templates/filer-statefulset.yaml index 7fe5bb4e3..a4f38830f 100644 --- a/k8s/seaweedfs/templates/filer-statefulset.yaml +++ b/k8s/seaweedfs/templates/filer-statefulset.yaml @@ -101,7 +101,7 @@ spec: -port={{ .Values.filer.port }} \ {{- if .Values.filer.metricsPort }} -metricsPort {{ .Values.filer.metricsPort }} \ - {{- end }}} + {{- end }} {{- if .Values.filer.redirectOnRead }} -redirectOnRead \ {{- end }} diff --git a/k8s/seaweedfs/templates/s3-deployment.yaml b/k8s/seaweedfs/templates/s3-deployment.yaml index b6115be37..f7244ad76 100644 --- a/k8s/seaweedfs/templates/s3-deployment.yaml +++ b/k8s/seaweedfs/templates/s3-deployment.yaml @@ -73,7 +73,7 @@ spec: -port={{ .Values.s3.port }} \ {{- if .Values.s3.metricsPort }} -metricsPort {{ .Values.s3.metricsPort }} \ - {{- end }}} + {{- end }} {{- if .Values.global.enableSecurity }} -cert.file=/usr/local/share/ca-certificates/client/tls.crt \ -key.file=/usr/local/share/ca-certificates/client/tls.key \ diff --git a/k8s/seaweedfs/templates/s3-service.yaml b/k8s/seaweedfs/templates/s3-service.yaml index b5db3bba1..4a68c7976 100644 --- a/k8s/seaweedfs/templates/s3-service.yaml +++ b/k8s/seaweedfs/templates/s3-service.yaml @@ -14,10 +14,10 @@ spec: protocol: TCP {{- if .Values.s3.metricsPort }} - name: "swfs-s3-metrics" - port: {{ .Values.filer.s3 }} + port: {{ .Values.s3.metricsPort }} targetPort: {{ .Values.s3.metricsPort }} protocol: TCP -{{- end }}} +{{- end }} selector: app: {{ template "seaweedfs.name" . }} component: s3
\ No newline at end of file diff --git a/k8s/seaweedfs/templates/s3-servicemonitor.yaml b/k8s/seaweedfs/templates/s3-servicemonitor.yaml index 03b13ae8e..7f18f00f5 100644 --- a/k8s/seaweedfs/templates/s3-servicemonitor.yaml +++ b/k8s/seaweedfs/templates/s3-servicemonitor.yaml @@ -15,4 +15,4 @@ spec: selector: app: {{ template "seaweedfs.name" . }} component: s3 -{{- end }}}
\ No newline at end of file +{{- end }}
\ No newline at end of file diff --git a/k8s/seaweedfs/templates/volume-service.yaml b/k8s/seaweedfs/templates/volume-service.yaml index ea3bf75fa..a2b0b540e 100644 --- a/k8s/seaweedfs/templates/volume-service.yaml +++ b/k8s/seaweedfs/templates/volume-service.yaml @@ -22,7 +22,7 @@ spec: port: {{ .Values.volume.metricsPort }} targetPort: {{ .Values.volume.metricsPort }} protocol: TCP -{{- end }}} +{{- end }} selector: app: {{ template "seaweedfs.name" . }} component: volume
\ No newline at end of file diff --git a/k8s/seaweedfs/templates/volume-servicemonitor.yaml b/k8s/seaweedfs/templates/volume-servicemonitor.yaml index 64b5cf425..1b286e9b6 100644 --- a/k8s/seaweedfs/templates/volume-servicemonitor.yaml +++ b/k8s/seaweedfs/templates/volume-servicemonitor.yaml @@ -15,4 +15,4 @@ spec: selector: app: {{ template "seaweedfs.name" . }} component: volume -{{- end }}}
\ No newline at end of file +{{- end }}
\ No newline at end of file diff --git a/k8s/seaweedfs/templates/volume-statefulset.yaml b/k8s/seaweedfs/templates/volume-statefulset.yaml index 27fa7888e..6c519f374 100644 --- a/k8s/seaweedfs/templates/volume-statefulset.yaml +++ b/k8s/seaweedfs/templates/volume-statefulset.yaml @@ -78,7 +78,7 @@ spec: -port={{ .Values.volume.port }} \ {{- if .Values.volume.metricsPort }} -metricsPort {{ .Values.volume.metricsPort }} \ - {{- end }}} + {{- end }} -dir={{ .Values.volume.dir }} \ -max={{ .Values.volume.maxVolumes }} \ {{- if .Values.volume.rack }} |