a
/
seaweedfs-operator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix filer starting

This commit is contained in:
Chris Lu 2020-10-17 00:59:38 -07:00
parent a55feda96d
commit 4ea680c4c9
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/controller_filer.go
View File

@ -16,11 +16,11 @@ func (r *SeaweedReconciler) ensureFilerServers(seaweedCR *seaweedv1.Seaweed) (do
_ = context.Background() _ = context.Background()
_ = r.Log.WithValues("seaweed", seaweedCR.Name) _ = r.Log.WithValues("seaweed", seaweedCR.Name)
if done, result, err = r.ensureFilerStatefulSet(seaweedCR); done { if done, result, err = r.ensureFilerService(seaweedCR); done {
return return
} }
if done, result, err = r.ensureFilerService(seaweedCR); done { if done, result, err = r.ensureFilerStatefulSet(seaweedCR); done {
return return
} }

5
controllers/controller_filer_statefulset.go
View File

@ -75,7 +75,7 @@ func (r *SeaweedReconciler) createFilerStatefulSet(m *seaweedv1.Seaweed) *appsv1
"-ec", "-ec",
fmt.Sprintf("weed filer -port=8888 %s %s -s3", fmt.Sprintf("weed filer -port=8888 %s %s -s3",
fmt.Sprintf("-ip=$(POD_NAME).%s-filer", m.Name), 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), 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, ContainerPort: 8333,
Name: "swfs-s3", Name: "swfs-s3",
}, },
{
ContainerPort: 18333,
},
}, },
/* /*
ReadinessProbe: &corev1.Probe{ ReadinessProbe: &corev1.Probe{