Fix CI issues for QueryNode deployment mode switching

Signed-off-by: hodie-aurora <zhw1726195788@gmail.com>

Author: hodie-aurora

pkg/controllers/deploy_ctrl.go

@@ -64,16 +64,19 @@ func (c *DeployControllerImpl) Reconcile(ctx context.Context, mc v1beta1.Milvus,
 		}
 		if configuredDeployMode != currentDeployMode {
 			logger.Info("deploy mode mismatch detected", "configured", configuredDeployMode, "current", currentDeployMode)
-			if configuredDeployMode == v1beta1.OneDeployMode {
+			switch configuredDeployMode {
+			case v1beta1.OneDeployMode:
 				err = biz.ChangeToOneDeployMode(ctx, mc)
 				if err != nil {
 					return errors.Wrap(err, "change to OneDeployMode")
 				}
-			} else if configuredDeployMode == v1beta1.TwoDeployMode {
+			case v1beta1.TwoDeployMode:
 				err = biz.ChangeToTwoDeployMode(ctx, mc)
 				if err != nil {
 					return errors.Wrap(err, "change to TwoDeployMode")
 				}
+			default:
+				return errors.New("invalid deploy mode")
 			}
 			err = biz.MarkDeployModeChanging(ctx, mc, true)
 			if err != nil {

pkg/controllers/deploy_ctrl_test.go

@@ -856,7 +856,7 @@ func TestDeployControllerImpl_handleTwoDeployMode(t *testing.T) {
 	if mc.Spec.Com.QueryNode == nil {
 		mc.Spec.Com.QueryNode = &v1beta1.MilvusQueryNode{}
 	}
-	mc.Spec.Com.QueryNode.Component.Replicas = int32Ptr(1)
+	mc.Spec.Com.QueryNode.Replicas = int32Ptr(1)
 	mc.Spec.Com.QueryNode.DeployMode = "TwoDeployMode"
 
 	replicas := ReplicasValue(QueryNode.GetReplicas(mc.Spec))
@@ -888,7 +888,7 @@ func TestDeployControllerImpl_handleTwoDeployMode(t *testing.T) {
 
 	t.Run("stop mode", func(t *testing.T) {
 		m := mc
-		m.Spec.Com.QueryNode.Component.Replicas = int32Ptr(0)
+		m.Spec.Com.QueryNode.Replicas = int32Ptr(0)
 		mockBiz.EXPECT().HandleCreate(ctx, m).Return(nil)
 		mockBiz.EXPECT().IsPaused(ctx, m).Return(false)
 		mockBiz.EXPECT().HandleStop(ctx, m).Return(nil)
@@ -897,7 +897,7 @@ func TestDeployControllerImpl_handleTwoDeployMode(t *testing.T) {
 	})
 
 	t.Run("rolling failed", func(t *testing.T) {
-		mc.Spec.Com.QueryNode.Component.Replicas = int32Ptr(1)
+		mc.Spec.Com.QueryNode.Replicas = int32Ptr(1)
 		mockBiz.EXPECT().HandleCreate(ctx, mc).Return(nil)
 		mockBiz.EXPECT().IsPaused(ctx, mc).Return(false)
 		mockBiz.EXPECT().HandleRolling(ctx, mc).Return(errMock)

pkg/controllers/deploy_mode_changer.go

@@ -262,7 +262,10 @@ func (c *DeployModeChangerImpl) ChangeToOneDeployMode(ctx context.Context, mc v1
 				},
 			},
 		}
-		ctrl.SetControllerReference(&mc, currentDeploy, c.cli.Scheme())
+		err := ctrl.SetControllerReference(&mc, currentDeploy, c.cli.Scheme())
+		if err != nil {
+			return errors.Wrap(err, "set controller reference")
+		}
 		err = c.util.CreateObject(ctx, currentDeploy)
 		if err != nil {
 			return errors.Wrap(err, "create current deployment with groupId=0")