From b0f01a5e1adc8c3dcf2ae971298ea44c80eb37eb Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 8 Nov 2020 16:12:31 -0800 Subject: [PATCH] add namespace to master peers list --- controllers/controller_filer_statefulset.go | 2 +- controllers/controller_master_statefulset.go | 2 +- controllers/controller_volume_statefulset.go | 2 +- controllers/helper.go | 11 ++++++----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/controllers/controller_filer_statefulset.go b/controllers/controller_filer_statefulset.go index 153acdd..4d8632d 100644 --- a/controllers/controller_filer_statefulset.go +++ b/controllers/controller_filer_statefulset.go @@ -17,7 +17,7 @@ func buildFilerStartupScript(m *seaweedv1.Seaweed) string { commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.FilerHTTPPort)) commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-filer-peer", m.Name)) commands = append(commands, fmt.Sprintf("-peers=%s", getFilerPeersString(m.Name, m.Spec.Filer.Replicas))) - commands = append(commands, fmt.Sprintf("-master=%s", getMasterPeersString(m.Name, m.Spec.Master.Replicas))) + commands = append(commands, fmt.Sprintf("-master=%s", getMasterPeersString(m))) commands = append(commands, "-s3") return strings.Join(commands, " ") diff --git a/controllers/controller_master_statefulset.go b/controllers/controller_master_statefulset.go index 498e4c1..5ca62c4 100644 --- a/controllers/controller_master_statefulset.go +++ b/controllers/controller_master_statefulset.go @@ -32,7 +32,7 @@ func buildMasterStartupScript(m *seaweedv1.Seaweed) string { } command = append(command, fmt.Sprintf("-ip=$(POD_NAME).%s-master-peer", m.Name)) - command = append(command, fmt.Sprintf("-peers=%s", getMasterPeersString(m.Name, spec.Replicas))) + command = append(command, fmt.Sprintf("-peers=%s", getMasterPeersString(m))) return strings.Join(command, " ") } diff --git a/controllers/controller_volume_statefulset.go b/controllers/controller_volume_statefulset.go index e0d4cc5..3da9b53 100644 --- a/controllers/controller_volume_statefulset.go +++ b/controllers/controller_volume_statefulset.go @@ -17,7 +17,7 @@ func buildVolumeServerStartupScript(m *seaweedv1.Seaweed, dirs []string) string commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.VolumeHTTPPort)) commands = append(commands, "-max=0") commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-volume-peer", m.Name)) - commands = append(commands, fmt.Sprintf("-mserver=%s", getMasterPeersString(m.Name, m.Spec.Master.Replicas))) + commands = append(commands, fmt.Sprintf("-mserver=%s", getMasterPeersString(m))) commands = append(commands, fmt.Sprintf("-dir=%s", strings.Join(dirs, ","))) return strings.Join(commands, " ") diff --git a/controllers/helper.go b/controllers/helper.go index f449876..fc15d26 100644 --- a/controllers/helper.go +++ b/controllers/helper.go @@ -4,12 +4,13 @@ import ( "fmt" "strings" + seaweedv1 "github.com/seaweedfs/seaweedfs-operator/api/v1" corev1 "k8s.io/api/core/v1" ctrl "sigs.k8s.io/controller-runtime" ) const ( - masterPeerAddressPattern = "%s-master-%d.%s-master-peer:9333" + masterPeerAddressPattern = "%s-master-%d.%s-master-peer.%s:9333" filerPeerAddressPattern = "%s-filer-%d.%s-filer-peer:8888" masterPeerAddressWithNamespacePattern = "%s-master-%d.%s-master-peer.%s:9333" filerServiceAddressWithNamespacePattern = "%s-filer.%s:8888" @@ -64,16 +65,16 @@ func getFilerPeersString(name string, replicas int32) string { return strings.Join(getFilerAddresses(name, replicas), ",") } -func getMasterAddresses(name string, replicas int32) []string { +func getMasterAddresses(namespace string, name string, replicas int32) []string { peersAddresses := make([]string, 0, replicas) for i := int32(0); i < replicas; i++ { - peersAddresses = append(peersAddresses, fmt.Sprintf(masterPeerAddressPattern, name, i, name)) + peersAddresses = append(peersAddresses, fmt.Sprintf(masterPeerAddressPattern, name, i, name, namespace)) } return peersAddresses } -func getMasterPeersString(name string, replicas int32) string { - return strings.Join(getMasterAddresses(name, replicas), ",") +func getMasterPeersString(m *seaweedv1.Seaweed) string { + return strings.Join(getMasterAddresses(m.Namespace, m.Name, m.Spec.Master.Replicas), ",") } func getMasterAddressesWithNamespace(name, namespace string, replicas int32) []string {