Skip to content

Commit

Permalink
fix: fix nil pointer error
Browse files Browse the repository at this point in the history
Signed-off-by: Rory Z <[email protected]>
  • Loading branch information
Rory-Z committed Sep 2, 2024
1 parent 212ff8b commit ea7b8d7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
8 changes: 4 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 💡

Expand All @@ -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
```

Expand Down
24 changes: 13 additions & 11 deletions controllers/apps/v2beta1/update_emqx_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}

Check warning on line 132 in controllers/apps/v2beta1/update_emqx_status.go

View check run for this annotation

Codecov / codecov/patch

controllers/apps/v2beta1/update_emqx_status.go#L131-L132

Added lines #L131 - L132 were not covered by tests
instance.Status.NodeEvacuationsStatus = nodeEvacuationsStatus
}
instance.Status.NodeEvacuationsStatus = nodeEvacuationsStatus
}

// update status condition
Expand Down
2 changes: 1 addition & 1 deletion e2e/v2beta1/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())

Expand Down

0 comments on commit ea7b8d7

Please sign in to comment.