Merge pull request #192 from jwcesign/main

Wei · web-flow · commit 04f2f404243a · 2025-03-02T12:39:46.000+08:00
chore: cleanup duplicated nodeclass status
diff --git a/pkg/apis/v1alpha1/ecsnodeclass_status.go b/pkg/apis/v1alpha1/ecsnodeclass_status.go
@@ -24,7 +24,6 @@ import (
 const (
 	ConditionTypeVSwitchesReady      = "VSwitchesReady"
 	ConditionTypeSecurityGroupsReady = "SecurityGroupsReady"
-	ConditionTypeInstanceRAMReady    = "InstanceRAMReady"
 	ConditionTypeImagesReady         = "ImagesReady"
 )
 
@@ -84,7 +83,6 @@ func (in *ECSNodeClass) StatusConditions() status.ConditionSet {
 	return status.NewReadyConditions(
 		ConditionTypeVSwitchesReady,
 		ConditionTypeSecurityGroupsReady,
-		ConditionTypeInstanceRAMReady,
 		ConditionTypeImagesReady,
 	).For(in)
 }
diff --git a/pkg/controllers/nodeclass/status/controller.go b/pkg/controllers/nodeclass/status/controller.go
@@ -78,9 +78,6 @@ func (c *Controller) Reconcile(ctx context.Context, nodeClass *v1alpha1.ECSNodeC
 	}
 	stored := nodeClass.DeepCopy()
 
-	// TODO: implement different conditions setup
-	nodeClass.StatusConditions().SetTrue(v1alpha1.ConditionTypeInstanceRAMReady)
-
 	var results []reconcile.Result
 	var errs error
 	for _, reconciler := range []nodeClassStatusReconciler{

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ import (`
`24`	`24`	`const (`
`25`	`25`	`ConditionTypeVSwitchesReady = "VSwitchesReady"`
`26`	`26`	`ConditionTypeSecurityGroupsReady = "SecurityGroupsReady"`
`27`		`- ConditionTypeInstanceRAMReady = "InstanceRAMReady"`
`28`	`27`	`ConditionTypeImagesReady = "ImagesReady"`
`29`	`28`	`)`
`30`	`29`
`@@ -84,7 +83,6 @@ func (in *ECSNodeClass) StatusConditions() status.ConditionSet {`
`84`	`83`	`return status.NewReadyConditions(`
`85`	`84`	`ConditionTypeVSwitchesReady,`
`86`	`85`	`ConditionTypeSecurityGroupsReady,`
`87`		`- ConditionTypeInstanceRAMReady,`
`88`	`86`	`ConditionTypeImagesReady,`
`89`	`87`	`).For(in)`
`90`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,6 @@ func (c Controller) Reconcile(ctx context.Context, nodeClass v1alpha1.ECSNodeC`
`78`	`78`	`}`
`79`	`79`	`stored := nodeClass.DeepCopy()`
`80`	`80`
`81`		`- // TODO: implement different conditions setup`
`82`		`- nodeClass.StatusConditions().SetTrue(v1alpha1.ConditionTypeInstanceRAMReady)`
`83`		`-`
`84`	`81`	`var results []reconcile.Result`
`85`	`82`	`var errs error`
`86`	`83`	`for _, reconciler := range []nodeClassStatusReconciler{`