Merge pull request #806 from l1b0k/release-1.9

BSWANG · web-flow · commit 85d2aab69fb0 · 2025-03-31T20:10:37.000+08:00
fix(builder): handle instance limit retrieval error
diff --git a/daemon/builder.go b/daemon/builder.go
@@ -194,7 +194,7 @@ func (b *NetworkServiceBuilder) initInstanceLimit() error {
 	} else {
 		limit, err := provider.GetLimitFromAnno(node.Annotations)
 		if err != nil {
-			return err
+			serviceLog.Error(err, "unable to get instance limit from annotation")
 		}
 		if limit == nil || instance.GetInstanceMeta().InstanceType != limit.InstanceTypeID {
 			limit, err = provider.GetLimit(b.aliyunClient, instance.GetInstanceMeta().InstanceType)

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func (b *NetworkServiceBuilder) initInstanceLimit() error {`
`194`	`194`	`} else {`
`195`	`195`	`limit, err := provider.GetLimitFromAnno(node.Annotations)`
`196`	`196`	`if err != nil {`
`197`		`- return err`
	`197`	`+ serviceLog.Error(err, "unable to get instance limit from annotation")`
`198`	`198`	`}`
`199`	`199`	`if limit == nil \|\| instance.GetInstanceMeta().InstanceType != limit.InstanceTypeID {`
`200`	`200`	`limit, err = provider.GetLimit(b.aliyunClient, instance.GetInstanceMeta().InstanceType)`