chore: tidy up

apecloud · Jun 6, 2023 · d885035 · d885035
1 parent de7484c
commit d885035
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/controllers/apps/operations/vertical_scaling.go b/controllers/apps/operations/vertical_scaling.go
@@ -123,8 +123,10 @@ func (vs verticalScalingHandler) GetRealAffectedComponentMap(opsRequest *appsv1a
 // Cancel this function defines the cancel verticalScaling action.
 func (vs verticalScalingHandler) Cancel(reqCxt intctrlutil.RequestCtx, cli client.Client, opsRes *OpsResource) error {
 	return cancelComponentOps(reqCxt.Ctx, cli, opsRes, func(lastConfig *appsv1alpha1.LastComponentConfiguration, comp *appsv1alpha1.ClusterComponentSpec) error {
-		comp.ClassDefRef = &appsv1alpha1.ClassDefRef{Class: lastConfig.Class}
 		comp.Resources = lastConfig.ResourceRequirements
+		if lastConfig.ClassDefRef != nil {
+			comp.ClassDefRef = lastConfig.ClassDefRef
+		}
 		return nil
 	})
 }
diff --git a/internal/cli/cmd/cluster/create_test.go b/internal/cli/cmd/cluster/create_test.go
@@ -221,13 +221,13 @@ var _ = Describe("create", func() {
 				keyStorageClass: "test-other",
 			},
 		}
-		comps, err := buildClusterComp(cd, setsMap, componentClasses)
+		comps, err := buildClusterComp(cd, setsMap, clsMgr)
 		Expect(err).Should(Succeed())
 		checkComponent(comps, "10Gi", 10, "10", "2Gi", "test", 0)
 		checkComponent(comps, "5Gi", 5, "5", "1Gi", "test-other", 1)
 		setsMap[testing.ComponentDefName][keySwitchPolicy] = "invalid"
 		cd.Spec.ComponentDefs[0].WorkloadType = appsv1alpha1.Replication
-		_, err = buildClusterComp(cd, setsMap, componentClasses)
+		_, err = buildClusterComp(cd, setsMap, clsMgr)
 		Expect(err).Should(HaveOccurred())
 	})