Skip to content

Cherry pick PR(224)/fix(instance): ice err #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions pkg/providers/instance/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,22 +385,26 @@ func (p *DefaultProvider) launchInstance(ctx context.Context, nodeClass *v1alpha
return nil, nil, fmt.Errorf("getting provisioning group, %w", err)
}

var resp *ecsclient.CreateAutoProvisioningGroupResponse
runtime := &util.RuntimeOptions{}

defer p.updateUnavailableOfferingsCache(ctx, resp, capacityType)
resp, err = p.ecsClient.CreateAutoProvisioningGroupWithOptions(createAutoProvisioningGroupRequest, runtime)
resp, err := p.ecsClient.CreateAutoProvisioningGroupWithOptions(createAutoProvisioningGroupRequest, runtime)
if err != nil {
return nil, nil, fmt.Errorf("creating auto provisioning group, %w", err)
}

p.updateUnavailableOfferingsCache(ctx, resp, capacityType)

if err := createAutoProvisioningGroupResponseHandler(resp); err != nil {
return nil, nil, err
}

return resp.Body.LaunchResults.LaunchResult[0], createAutoProvisioningGroupRequest, nil
}

const (
ErrCodeNoInstanceStock = "NoInstanceStock"
ErrCodeOperationDeniedNoStock = "OperationDenied.NoStock"
)

func (p *DefaultProvider) updateUnavailableOfferingsCache(ctx context.Context, resp *ecsclient.CreateAutoProvisioningGroupResponse, capacityType string) {
if resp == nil || resp.Body == nil || resp.Body.LaunchResults == nil || len(resp.Body.LaunchResults.LaunchResult) == 0 {
return
Expand All @@ -411,7 +415,7 @@ func (p *DefaultProvider) updateUnavailableOfferingsCache(ctx context.Context, r
continue
}

if (tea.StringValue(resp.Body.LaunchResults.LaunchResult[lri].ErrorCode) == "NoInstanceStock" || tea.StringValue(resp.Body.LaunchResults.LaunchResult[lri].ErrorCode) == "OperationDenied.NoStock") &&
if (tea.StringValue(resp.Body.LaunchResults.LaunchResult[lri].ErrorCode) == ErrCodeNoInstanceStock || tea.StringValue(resp.Body.LaunchResults.LaunchResult[lri].ErrorCode) == ErrCodeOperationDeniedNoStock) &&
tea.StringValue(resp.Body.LaunchResults.LaunchResult[lri].InstanceType) != "" &&
tea.StringValue(resp.Body.LaunchResults.LaunchResult[lri].ZoneId) != "" {
p.unavailableOfferings.MarkUnavailable(
Expand Down Expand Up @@ -441,6 +445,12 @@ func createAutoProvisioningGroupResponseHandler(resp *ecsclient.CreateAutoProvis

launchResult := launchResults[0]

if tea.StringValue(launchResult.ErrorCode) == ErrCodeNoInstanceStock || tea.StringValue(launchResult.ErrorCode) == ErrCodeOperationDeniedNoStock {
return cloudprovider.NewInsufficientCapacityError(alierrors.WithRequestID(tea.StringValue(resp.Body.RequestId),
fmt.Errorf("failed to launch instance: errorCode=%s, errorMessage=%s",
tea.StringValue(launchResult.ErrorCode), tea.StringValue(launchResult.ErrorMsg))))
}

if launchResult.InstanceIds == nil || len(launchResult.InstanceIds.InstanceId) == 0 {
return alierrors.WithRequestID(tea.StringValue(resp.Body.RequestId),
fmt.Errorf("failed to launch instance: errorCode=%s, errorMessage=%s",
Expand Down