Fix incorrectly setting cluster ready to true

prydie · prydie · commit 8d3360b91a06 · 2018-07-05T16:12:16.000+01:00
diff --git a/pkg/controllers/cluster/controller.go b/pkg/controllers/cluster/controller.go
@@ -470,7 +470,7 @@ func (m *MySQLController) updateClusterStatus(cluster *v1alpha1.Cluster, ss *app
 	if condition == nil {
 		condition = &v1alpha1.ClusterCondition{Type: v1alpha1.ClusterReady}
 	}
-	if ss.Status.ReadyReplicas == ss.Status.Replicas {
+	if ss.Status.ReadyReplicas == ss.Status.Replicas && ss.Status.ReadyReplicas == cluster.Spec.Members {
 		condition.Status = corev1.ConditionTrue
 	} else {
 		condition.Status = corev1.ConditionFalse

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ func (m MySQLController) updateClusterStatus(cluster v1alpha1.Cluster, ss *app`
`470`	`470`	`if condition == nil {`
`471`	`471`	`condition = &v1alpha1.ClusterCondition{Type: v1alpha1.ClusterReady}`
`472`	`472`	`}`
`473`		`- if ss.Status.ReadyReplicas == ss.Status.Replicas {`
	`473`	`+ if ss.Status.ReadyReplicas == ss.Status.Replicas && ss.Status.ReadyReplicas == cluster.Spec.Members {`
`474`	`474`	`condition.Status = corev1.ConditionTrue`
`475`	`475`	`} else {`
`476`	`476`	`condition.Status = corev1.ConditionFalse`