From 4ea680c4c9a68d736ed3f94398fb23c66743f660 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 17 Oct 2020 00:59:38 -0700 Subject: [PATCH] fix filer starting --- controllers/controller_filer.go | 4 ++-- controllers/controller_filer_statefulset.go | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/controllers/controller_filer.go b/controllers/controller_filer.go index 5c8d999..3c0d73e 100644 --- a/controllers/controller_filer.go +++ b/controllers/controller_filer.go @@ -16,11 +16,11 @@ func (r *SeaweedReconciler) ensureFilerServers(seaweedCR *seaweedv1.Seaweed) (do _ = context.Background() _ = r.Log.WithValues("seaweed", seaweedCR.Name) - if done, result, err = r.ensureFilerStatefulSet(seaweedCR); done { + if done, result, err = r.ensureFilerService(seaweedCR); done { return } - if done, result, err = r.ensureFilerService(seaweedCR); done { + if done, result, err = r.ensureFilerStatefulSet(seaweedCR); done { return } diff --git a/controllers/controller_filer_statefulset.go b/controllers/controller_filer_statefulset.go index 5e05c11..80e3bce 100644 --- a/controllers/controller_filer_statefulset.go +++ b/controllers/controller_filer_statefulset.go @@ -75,7 +75,7 @@ func (r *SeaweedReconciler) createFilerStatefulSet(m *seaweedv1.Seaweed) *appsv1 "-ec", fmt.Sprintf("weed filer -port=8888 %s %s -s3", fmt.Sprintf("-ip=$(POD_NAME).%s-filer", m.Name), - fmt.Sprintf("-peers=%s-master-0.%s-master:9333,%s-master-1.%s-master:9333,%s-master-2.%s-master:9333", + fmt.Sprintf("-master=%s-master-0.%s-master:9333,%s-master-1.%s-master:9333,%s-master-2.%s-master:9333", m.Name, m.Name, m.Name, m.Name, m.Name, m.Name), ), }, @@ -91,9 +91,6 @@ func (r *SeaweedReconciler) createFilerStatefulSet(m *seaweedv1.Seaweed) *appsv1 ContainerPort: 8333, Name: "swfs-s3", }, - { - ContainerPort: 18333, - }, }, /* ReadinessProbe: &corev1.Probe{