diff --git a/RELEASE.md b/RELEASE.md index d240a853..79850582 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,6 @@ # Release Note 🍻 -EMQX Operator 2.2.23 has been released. +EMQX Operator 2.2.24-rc.1 has been released. ## Supported version + apps.emqx.io/v2beta1 @@ -13,11 +13,11 @@ EMQX Operator 2.2.23 has been released. + EMQX at 4.4.14 and later + EMQX Enterprise at 4.4.14 and later -## Other Changes ✨ +## Fixes 🐞 + `apps.emqx.io/v2beta1 EMQX`. - + 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. + + Fix sometimes will got nil pointer error. ## 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.23 + --version 2.2.24-rc.1 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 3bff86a9..7d7232d2 100644 --- a/controllers/apps/v2beta1/update_emqx_status.go +++ b/controllers/apps/v2beta1/update_emqx_status.go @@ -117,19 +117,21 @@ func (u *updateStatus) reconcile(ctx context.Context, logger logr.Logger, instan } } - isEnterpriser := false - for _, node := range coreNodes { - if node.ControllerUID == currentSts.UID && node.Edition == "Enterprise" { - isEnterpriser = true - break + if currentSts != nil { + 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()) + if isEnterpriser { + nodeEvacuationsStatus, err := getNodeEvacuationStatusByAPI(r) + if err != nil { + u.EventRecorder.Event(instance, corev1.EventTypeWarning, "FailedToGetNodeEvacuationStatuses", err.Error()) + } + instance.Status.NodeEvacuationsStatus = nodeEvacuationsStatus } - instance.Status.NodeEvacuationsStatus = nodeEvacuationsStatus } // update status condition diff --git a/e2e/v2beta1/e2e_test.go b/e2e/v2beta1/e2e_test.go index 25555038..661b0b61 100644 --- a/e2e/v2beta1/e2e_test.go +++ b/e2e/v2beta1/e2e_test.go @@ -513,7 +513,7 @@ var _ = Describe("E2E Test", Label("base"), Ordered, func() { if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(instance), instance); err != nil { return err } - instance.Spec.Image = "emqx/emqx-enterprise:latest" + instance.Spec.Image = "emqx/emqx-enterprise:latest" // EMQX Community Edition is not supported core + replicant cluster after 5.7 return k8sClient.Update(ctx, instance) })).Should(Succeed())