From de277418bfa8fe1118158da62679a56b5d99f709 Mon Sep 17 00:00:00 2001
From: LazyDBA247-Anyvision <yonin@anyvision.co>
Date: Sun, 8 Nov 2020 02:07:16 +0200
Subject: [PATCH 1/2] remove extra curly brace helm read/need only 2

---
 k8s/seaweedfs/templates/filer-statefulset.yaml     | 2 +-
 k8s/seaweedfs/templates/s3-deployment.yaml         | 2 +-
 k8s/seaweedfs/templates/s3-service.yaml            | 2 +-
 k8s/seaweedfs/templates/s3-servicemonitor.yaml     | 2 +-
 k8s/seaweedfs/templates/volume-service.yaml        | 2 +-
 k8s/seaweedfs/templates/volume-servicemonitor.yaml | 2 +-
 k8s/seaweedfs/templates/volume-statefulset.yaml    | 2 +-
 7 files changed, 7 insertions(+), 7 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..361ff7c64 100644
--- a/k8s/seaweedfs/templates/s3-service.yaml
+++ b/k8s/seaweedfs/templates/s3-service.yaml
@@ -17,7 +17,7 @@ spec:
     port: {{ .Values.filer.s3 }}
     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 }}

From e7e3d8df7c1d9c9d356339aacfa50afba8884372 Mon Sep 17 00:00:00 2001
From: LazyDBA247-Anyvision <yonin@anyvision.co>
Date: Sun, 8 Nov 2020 02:07:47 +0200
Subject: [PATCH 2/2] fix reading the correct Values.yaml for s3 metricsPort

---
 k8s/seaweedfs/templates/s3-service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s/seaweedfs/templates/s3-service.yaml b/k8s/seaweedfs/templates/s3-service.yaml
index 361ff7c64..4a68c7976 100644
--- a/k8s/seaweedfs/templates/s3-service.yaml
+++ b/k8s/seaweedfs/templates/s3-service.yaml
@@ -14,7 +14,7 @@ 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 }}