fix: fix operator crashed in func generateNodeCookieSecret

Signed-off-by: Rory Z <[email protected]>
emqx · Dec 2, 2023 · a8fa745 · a8fa745
1 parent b3d1765
commit a8fa745
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/controllers/apps/v2beta1/emqx_controller.go b/controllers/apps/v2beta1/emqx_controller.go
@@ -27,6 +27,7 @@ import (
 	emperror "emperror.dev/errors"
 	innerErr "github.com/emqx/emqx-operator/internal/errors"
 	innerReq "github.com/emqx/emqx-operator/internal/requester"
+	"github.com/rory-z/go-hocon"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -102,6 +103,12 @@ func (r *EMQXReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		return ctrl.Result{}, nil
 	}
 
+	_, err := hocon.ParseString(instance.Spec.Config.Data)
+	if err != nil {
+		r.EventRecorder.Event(instance, corev1.EventTypeWarning, "InvalidConfig", "the .spec.config.data is not a valid HOCON config")
+		return ctrl.Result{}, emperror.Wrap(err, "failed to parse config")
+	}
+
 	requester, err := newRequester(r.Client, instance)
 	if err != nil {
 		if k8sErrors.IsNotFound(emperror.Cause(err)) {

diff --git a/controllers/apps/v2beta1/sync_emqx_config.go b/controllers/apps/v2beta1/sync_emqx_config.go
@@ -19,11 +19,7 @@ type syncConfig struct {
 }
 
 func (s *syncConfig) reconcile(ctx context.Context, instance *appsv2beta1.EMQX, r innerReq.RequesterInterface) subResult {
-	hoconConfig, err := hocon.ParseString(instance.Spec.Config.Data)
-	if err != nil {
-		s.EventRecorder.Event(instance, corev1.EventTypeWarning, "InvalidConfig", err.Error())
-		return subResult{err: emperror.Wrap(err, "failed to parse config")}
-	}
+	hoconConfig, _ := hocon.ParseString(instance.Spec.Config.Data)
 
 	// If core nodes is nil, the EMQX is in the process of being created
 	if len(instance.Status.CoreNodes) == 0 {