From 03588622ad529cac9b758f2df61c79a740c8da08 Mon Sep 17 00:00:00 2001
From: Rory Z <16801068+Rory-Z@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:00:58 +0800
Subject: [PATCH] Revert "fix: fix nil pointer error"

This reverts commit a898dfb.

Signed-off-by: Rory Z <16801068+Rory-Z@users.noreply.github.com>
---
 RELEASE.md                                    |  8 +++----
 .../apps/v2beta1/update_emqx_status.go        | 24 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 798505821..d240a853f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,6 +1,6 @@
 # Release Note 🍻
 
-EMQX Operator 2.2.24-rc.1 has been released.
+EMQX Operator 2.2.23 has been released.
 
 ## Supported version
 + apps.emqx.io/v2beta1
@@ -13,11 +13,11 @@ EMQX Operator 2.2.24-rc.1 has been released.
   + EMQX at 4.4.14 and later
   + EMQX Enterprise at 4.4.14 and later
 
-## Fixes 🐞
+## Other Changes ✨
 
 + `apps.emqx.io/v2beta1 EMQX`.
 
-  + Fix sometimes will got nil pointer error.
+  + Delete `apps.emqx.io/v2beta1/EMQX/status.coreNodes[*].uptime` and `apps.emqx.io/v2beta1/EMQX/status.replicantNodes[*].uptime`, because EMQX operator will constantly updating them. This is unnecessary wear and tear.
 
 ## How to install/upgrade EMQX Operator 💡
 
@@ -29,7 +29,7 @@ helm repo update
 helm upgrade --install emqx-operator emqx/emqx-operator \
   --namespace emqx-operator-system \
   --create-namespace \
-  --version 2.2.24-rc.1
+  --version 2.2.23
 kubectl wait --for=condition=Ready pods -l "control-plane=controller-manager" -n emqx-operator-system
 ```
 
diff --git a/controllers/apps/v2beta1/update_emqx_status.go b/controllers/apps/v2beta1/update_emqx_status.go
index 7d7232d2b..3bff86a91 100644
--- a/controllers/apps/v2beta1/update_emqx_status.go
+++ b/controllers/apps/v2beta1/update_emqx_status.go
@@ -117,21 +117,19 @@ func (u *updateStatus) reconcile(ctx context.Context, logger logr.Logger, instan
 		}
 	}
 
-	if currentSts != nil {
-		isEnterpriser := false
-		for _, node := range coreNodes {
-			if node.ControllerUID == currentSts.UID && node.Edition == "Enterprise" {
-				isEnterpriser = true
-				break
-			}
+	isEnterpriser := false
+	for _, node := range coreNodes {
+		if node.ControllerUID == currentSts.UID && node.Edition == "Enterprise" {
+			isEnterpriser = true
+			break
 		}
-		if isEnterpriser {
-			nodeEvacuationsStatus, err := getNodeEvacuationStatusByAPI(r)
-			if err != nil {
-				u.EventRecorder.Event(instance, corev1.EventTypeWarning, "FailedToGetNodeEvacuationStatuses", err.Error())
-			}
-			instance.Status.NodeEvacuationsStatus = nodeEvacuationsStatus
+	}
+	if isEnterpriser {
+		nodeEvacuationsStatus, err := getNodeEvacuationStatusByAPI(r)
+		if err != nil {
+			u.EventRecorder.Event(instance, corev1.EventTypeWarning, "FailedToGetNodeEvacuationStatuses", err.Error())
 		}
+		instance.Status.NodeEvacuationsStatus = nodeEvacuationsStatus
 	}
 
 	// update status condition