From cbb981aad9ff37bb975a8461956f538407aebf75 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 7 Nov 2021 21:28:26 -0800 Subject: [PATCH] 2.77 --- config/samples/seaweed_v1_seaweed.yaml | 2 +- controllers/controller_filer_statefulset.go | 1 - controllers/helper.go | 13 ------------- controllers/seaweed_controller_test.go | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/config/samples/seaweed_v1_seaweed.yaml b/config/samples/seaweed_v1_seaweed.yaml index 2e25e21..686f429 100644 --- a/config/samples/seaweed_v1_seaweed.yaml +++ b/config/samples/seaweed_v1_seaweed.yaml @@ -5,7 +5,7 @@ metadata: namespace: default spec: # Add fields here - image: chrislusf/seaweedfs:2.76 + image: chrislusf/seaweedfs:2.77 volumeServerDiskCount: 1 hostSuffix: seaweed.abcdefg.com master: diff --git a/controllers/controller_filer_statefulset.go b/controllers/controller_filer_statefulset.go index 1698d03..a6edd7f 100644 --- a/controllers/controller_filer_statefulset.go +++ b/controllers/controller_filer_statefulset.go @@ -16,7 +16,6 @@ func buildFilerStartupScript(m *seaweedv1.Seaweed) string { commands := []string{"weed", "filer"} commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.FilerHTTPPort)) commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-filer-peer.%s", m.Name, m.Namespace)) - commands = append(commands, fmt.Sprintf("-peers=%s", getFilerPeersString(m.Name, m.Namespace, m.Spec.Filer.Replicas))) commands = append(commands, fmt.Sprintf("-master=%s", getMasterPeersString(m))) commands = append(commands, "-s3") diff --git a/controllers/helper.go b/controllers/helper.go index 103cdba..1ce3f21 100644 --- a/controllers/helper.go +++ b/controllers/helper.go @@ -11,7 +11,6 @@ import ( const ( masterPeerAddressPattern = "%s-master-%d.%s-master-peer.%s:9333" - filerPeerAddressPattern = "%s-filer-%d.%s-filer-peer.%s:8888" ) var ( @@ -50,18 +49,6 @@ func ReconcileResult(err error) (bool, ctrl.Result, error) { return false, ctrl.Result{}, nil } -func getFilerAddresses(name string, namespace string, replicas int32) []string { - peersAddresses := make([]string, 0, replicas) - for i := int32(0); i < replicas; i++ { - peersAddresses = append(peersAddresses, fmt.Sprintf(filerPeerAddressPattern, name, i, name, namespace)) - } - return peersAddresses -} - -func getFilerPeersString(name string, namespace string, replicas int32) string { - return strings.Join(getFilerAddresses(name, namespace, replicas), ",") -} - func getMasterAddresses(namespace string, name string, replicas int32) []string { peersAddresses := make([]string, 0, replicas) for i := int32(0); i < replicas; i++ { diff --git a/controllers/seaweed_controller_test.go b/controllers/seaweed_controller_test.go index 7460e02..dda7303 100644 --- a/controllers/seaweed_controller_test.go +++ b/controllers/seaweed_controller_test.go @@ -39,7 +39,7 @@ var _ = Describe("Seaweed Controller", func() { Name: name, }, Spec: seaweedv1.SeaweedSpec{ - Image: "chrislusf/seaweedfs:2.76", + Image: "chrislusf/seaweedfs:2.77", VolumeServerDiskCount: 1, Master: &seaweedv1.MasterSpec{ Replicas: 3,