From 889ecf5c9d14be3ef360fef9ee8542e167b97265 Mon Sep 17 00:00:00 2001
From: Matt <washcycle@users.noreply.github.com>
Date: Tue, 7 Mar 2023 15:18:41 -0600
Subject: [PATCH 1/2] added secret envs to filer (#4284)

---
 .../seaweedfs/templates/filer-statefulset.yaml       |  6 ++++++
 k8s/charts/seaweedfs/values.yaml                     | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml b/k8s/charts/seaweedfs/templates/filer-statefulset.yaml
index 4b616fde1..b7227f934 100644
--- a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml
+++ b/k8s/charts/seaweedfs/templates/filer-statefulset.yaml
@@ -97,6 +97,12 @@ spec:
               value: {{ $value | quote }}
             {{- end }}
             {{- end }}
+            {{- if .Values.filer.secretExtraEnvironmentVars }}
+            {{- range $key, $value := .Values.filer.secretExtraEnvironmentVars }}
+            - name: {{ $key }}
+              valueFrom: {{ toYaml $value | nindent 16 }}
+            {{- end }}
+            {{- end }}             
           command:
             - "/bin/sh"
             - "-ec"
diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml
index 520a00307..1e2801e42 100644
--- a/k8s/charts/seaweedfs/values.yaml
+++ b/k8s/charts/seaweedfs/values.yaml
@@ -407,6 +407,18 @@ filer:
     # directories under this folder will be automatically creating a separate bucket
     WEED_FILER_BUCKETS_FOLDER: "/buckets"
 
+
+  # secret env variables
+  secretExtraEnvironmentVars: []
+      # WEED_POSTGRES_USERNAME:
+      #   secretKeyRef:
+      #     name: postgres-credentials
+      #     key: username
+      # WEED_POSTGRES_PASSWORD:
+      #   secretKeyRef:
+      #     name: postgres-credentials
+      #     key: password
+
   s3:
     enabled: true
     port: 8333

From 244385bf0d5ed9be2554619005fb1e469980632c Mon Sep 17 00:00:00 2001
From: Kevin Liu <mail@nivekuil.com>
Date: Wed, 8 Mar 2023 01:04:02 -0800
Subject: [PATCH 2/2] Fix binding metrics to ipv6 (#4286)

* Fix binding metrics to ipv6

* Update weed/stats/metrics.go

---------

Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com>
---
 weed/stats/metrics.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/weed/stats/metrics.go b/weed/stats/metrics.go
index a9a24ce31..454b35d7a 100644
--- a/weed/stats/metrics.go
+++ b/weed/stats/metrics.go
@@ -1,7 +1,6 @@
 package stats
 
 import (
-	"fmt"
 	"log"
 	"net"
 	"net/http"
@@ -282,12 +281,21 @@ func LoopPushingMetric(name, instance, addr string, intervalSeconds int) {
 	}
 }
 
+func JoinHostPort(host string, port int) string {
+	portStr := strconv.Itoa(port)
+	if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
+		return host + ":" + portStr
+	}
+	return net.JoinHostPort(host, portStr)
+}
+
+
 func StartMetricsServer(ip string, port int) {
 	if port == 0 {
 		return
 	}
 	http.Handle("/metrics", promhttp.HandlerFor(Gather, promhttp.HandlerOpts{}))
-	log.Fatal(http.ListenAndServe(fmt.Sprintf("%s:%d", ip, port), nil))
+	log.Fatal(http.ListenAndServe(JoinHostPort(ip, port), nil))
 }
 
 func SourceName(port uint32) string {