Skip to content

Commit b4dca4d

Browse files
committed
fix: fix nil pointer error
Signed-off-by: Rory Z <[email protected]>
1 parent 212ff8b commit b4dca4d

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

RELEASE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Release Note 🍻
22

3-
EMQX Operator 2.2.23 has been released.
3+
EMQX Operator 2.2.24-rc.1 has been released.
44

55
## Supported version
66
+ apps.emqx.io/v2beta1
@@ -13,11 +13,11 @@ EMQX Operator 2.2.23 has been released.
1313
+ EMQX at 4.4.14 and later
1414
+ EMQX Enterprise at 4.4.14 and later
1515

16-
## Other Changes ✨
16+
## Fixes 🐞
1717

1818
+ `apps.emqx.io/v2beta1 EMQX`.
1919

20-
+ 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.
20+
+ Fix sometimes will got nil pointer error.
2121

2222
## How to install/upgrade EMQX Operator 💡
2323

@@ -29,7 +29,7 @@ helm repo update
2929
helm upgrade --install emqx-operator emqx/emqx-operator \
3030
--namespace emqx-operator-system \
3131
--create-namespace \
32-
--version 2.2.23
32+
--version 2.2.24-rc.1
3333
kubectl wait --for=condition=Ready pods -l "control-plane=controller-manager" -n emqx-operator-system
3434
```
3535

controllers/apps/v2beta1/update_emqx_status.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,21 @@ func (u *updateStatus) reconcile(ctx context.Context, logger logr.Logger, instan
117117
}
118118
}
119119

120-
isEnterpriser := false
121-
for _, node := range coreNodes {
122-
if node.ControllerUID == currentSts.UID && node.Edition == "Enterprise" {
123-
isEnterpriser = true
124-
break
120+
if currentSts != nil {
121+
isEnterpriser := false
122+
for _, node := range coreNodes {
123+
if node.ControllerUID == currentSts.UID && node.Edition == "Enterprise" {
124+
isEnterpriser = true
125+
break
126+
}
125127
}
126-
}
127-
if isEnterpriser {
128-
nodeEvacuationsStatus, err := getNodeEvacuationStatusByAPI(r)
129-
if err != nil {
130-
u.EventRecorder.Event(instance, corev1.EventTypeWarning, "FailedToGetNodeEvacuationStatuses", err.Error())
128+
if isEnterpriser {
129+
nodeEvacuationsStatus, err := getNodeEvacuationStatusByAPI(r)
130+
if err != nil {
131+
u.EventRecorder.Event(instance, corev1.EventTypeWarning, "FailedToGetNodeEvacuationStatuses", err.Error())
132+
}
133+
instance.Status.NodeEvacuationsStatus = nodeEvacuationsStatus
131134
}
132-
instance.Status.NodeEvacuationsStatus = nodeEvacuationsStatus
133135
}
134136

135137
// update status condition

e2e/v2beta1/e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ var _ = Describe("E2E Test", Label("base"), Ordered, func() {
513513
if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(instance), instance); err != nil {
514514
return err
515515
}
516-
instance.Spec.Image = "emqx/emqx-enterprise:latest"
516+
instance.Spec.Image = "emqx/emqx:5.7" // EMQX Community Edition is not supported core + replicant cluster after 5.7
517517
return k8sClient.Update(ctx, instance)
518518
})).Should(Succeed())
519519

0 commit comments

Comments
 (0)