Merge pull request #198 from jwcesign/main

helen · web-flow · commit 55d28f66ed16 · 2025-03-06T19:10:58.000+08:00
fix: fix nil pointer of disk conversation
diff --git a/pkg/controllers/nodeclass/volumesize/controller.go b/pkg/controllers/nodeclass/volumesize/controller.go
@@ -48,7 +48,8 @@ func (c *Controller) Reconcile(ctx context.Context, nodeClass *v1alpha1.ECSNodeC
 
 	stored := nodeClass.DeepCopy()
 
-	if nodeClass.Spec.SystemDisk.Size != nil {
+	if nodeClass.Spec.SystemDisk != nil &&
+		nodeClass.Spec.SystemDisk.Size != nil {
 		nodeClass.Spec.SystemDisk.VolumeSize = resources.Quantity(fmt.Sprintf("%dG", *nodeClass.Spec.SystemDisk.Size))
 	}
 	if !equality.Semantic.DeepEqual(stored, nodeClass) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ func (c Controller) Reconcile(ctx context.Context, nodeClass v1alpha1.ECSNodeC`
`48`	`48`
`49`	`49`	`stored := nodeClass.DeepCopy()`
`50`	`50`
`51`		`- if nodeClass.Spec.SystemDisk.Size != nil {`
	`51`	`+ if nodeClass.Spec.SystemDisk != nil &&`
	`52`	`+ nodeClass.Spec.SystemDisk.Size != nil {`
`52`	`53`	`nodeClass.Spec.SystemDisk.VolumeSize = resources.Quantity(fmt.Sprintf("%dG", *nodeClass.Spec.SystemDisk.Size))`
`53`	`54`	`}`
`54`	`55`	`if !equality.Semantic.DeepEqual(stored, nodeClass) {`