fix: fix didn't delete pod when CR's replicas = 0

Signed-off-by: Rory Z <[email protected]>

controllers/apps/v1beta3/emqx_handler.go

@@ -69,6 +69,20 @@ func (r *EmqxReconciler) Do(ctx context.Context, instance appsv1beta3.Emqx) (ctr
 		return ctrl.Result{}, nil
 	}
 	if instance.GetReplicas() == nil || *instance.GetReplicas() == 0 {
+		if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+			storageSts := &appsv1.StatefulSet{}
+			if err := r.Get(ctx, client.ObjectKeyFromObject(generateStatefulSetDef(instance)), storageSts); err != nil {
+				if k8sErrors.IsNotFound(err) {
+					return nil
+				}
+				return err
+			}
+			storageSts.Spec.Replicas = instance.GetReplicas()
+			return r.Handler.Update(storageSts, func(o client.Object) error { return nil })
+		}); err != nil {
+			return ctrl.Result{}, emperror.Wrap(err, "failed to update statefulSet")
+		}
+
 		if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
 			_ = r.Get(ctx, client.ObjectKeyFromObject(instance), instance)
 			instance = updateEmqxStatus(instance, []appsv1beta3.EmqxNode{})
@@ -885,20 +899,27 @@ func updateEmqxStatus(instance appsv1beta3.Emqx, emqxNodes []appsv1beta3.EmqxNod
 	}
 
 	var cond *appsv1beta3.Condition
-	if status.Replicas == status.ReadyReplicas {
+	if status.Replicas == 0 {
 		cond = appsv1beta3.NewCondition(
 			appsv1beta3.ConditionRunning,
-			corev1.ConditionTrue,
-			"ClusterReady",
-			"All resources are ready",
+			corev1.ConditionFalse,
+			"ClusterNotReady",
+			"Replicas is 0",
 		)
-	} else {
+	} else if status.Replicas != status.ReadyReplicas {
 		cond = appsv1beta3.NewCondition(
 			appsv1beta3.ConditionRunning,
 			corev1.ConditionFalse,
 			"ClusterNotReady",
 			"Some nodes are not ready",
 		)
+	} else {
+		cond = appsv1beta3.NewCondition(
+			appsv1beta3.ConditionRunning,
+			corev1.ConditionTrue,
+			"ClusterReady",
+			"All resources are ready",
+		)
 	}
 	status.SetCondition(*cond)
 	instance.SetStatus(status)