Skip to content

fix(runners): support instance requirements in EC2 Fleet overrides #5314

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.

Sign up for GitHub

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

Open
slavab89 wants to merge 1 commit into
base: main
Choose a base branch
from
+78 −1
Open

fix(runners): support instance requirements in EC2 Fleet overrides #5314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 64 additions & 0 deletions lambdas/libs/compute-providers/aws/ec2/src/control-plane/runners.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,70 @@ describe('create runner', () => {
});
});

it('uses InstanceRequirements without static InstanceType overrides', async () => {
const instanceRequirements = {
VCpuCount: { Min: 4, Max: 8 },
MemoryMiB: { Min: 8192, Max: 16384 },
AllowedInstanceTypes: ['c7i.*', 'm7i.*'],
};

await createRunner({
...createRunnerConfig(defaultRunnerConfig),
ec2OverrideConfig: { InstanceRequirements: instanceRequirements },
});

expect(mockEC2Client).toHaveReceivedCommandWith(CreateFleetCommand, {
LaunchTemplateConfigs: [
{
LaunchTemplateSpecification: {
LaunchTemplateName: 'lt-1',
Version: '$Default',
},
Overrides: [
{
InstanceRequirements: instanceRequirements,
SubnetId: 'subnet-123',
},
{
InstanceRequirements: instanceRequirements,
SubnetId: 'subnet-456',
},
],
},
],
SpotOptions: {
AllocationStrategy: SpotAllocationStrategy.CAPACITY_OPTIMIZED,
},
TagSpecifications: expect.any(Array),
TargetCapacitySpecification: {
DefaultTargetCapacityType: 'spot',
TotalTargetCapacity: 1,
},
Type: 'instant',
});
});

it('rejects conflicting InstanceType and InstanceRequirements overrides', async () => {
await expect(
createRunner({
...createRunnerConfig(defaultRunnerConfig),
ec2OverrideConfig: {
InstanceType: 'c7i.xlarge',
InstanceRequirements: {
VCpuCount: { Min: 4 },
MemoryMiB: { Min: 8192 },
},
},
}),
).resolves.toEqual({
instances: [],
retryableErrorCount: 0,
nonRetryableErrorCount: 1,
});

expect(mockEC2Client).not.toHaveReceivedCommand(CreateFleetCommand);
});

it('overrides ImageId when specified in ec2OverrideConfig', async () => {
await createRunner({
...createRunnerConfig(defaultRunnerConfig),
Expand Down
15 changes: 14 additions & 1 deletion lambdas/libs/compute-providers/aws/ec2/src/control-plane/runners.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,24 @@ function generateFleetOverrides(
): FleetLaunchTemplateOverridesRequest[] {
const result: FleetLaunchTemplateOverridesRequest[] = [];

if (ec2OverrideConfig?.InstanceType && ec2OverrideConfig.InstanceRequirements) {

@edersonbrilhante edersonbrilhante Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. This works fine here for now. But if we need more validations like this one, this will get smelly.
To prevent a refactor in the future, lets create a validation function in /lambdas/libs/compute-providers/aws/ec2/src/control-plane/dynamic-labels.ts, there we can add the config validations, including this one

And in lambdas/libs/compute-providers/aws/ec2/src/control-plane/scale-up.ts we call the validation

    ec2OverrideConfig = parseEc2OverrideConfig(dynamicEC2Labels, defaultBlockDeviceName);
    if (ec2OverrideConfig) {
      logger.debug('EC2 override config parsed from labels', { ec2OverrideConfig });
    }
    <call validation function> with ec2OverrideConfig

throw new Error('InstanceType and InstanceRequirements cannot be used together');
}

// Use override values if available, otherwise use parameter arrays
const subnetsToUse = ec2OverrideConfig?.SubnetId ? [ec2OverrideConfig.SubnetId] : subnetIds;
const instanceTypesToUse = ec2OverrideConfig?.InstanceType ? [ec2OverrideConfig.InstanceType] : instancesTypes;
const amiIdToUse = ec2OverrideConfig?.ImageId ?? amiId;

if (ec2OverrideConfig?.InstanceRequirements) {
return subnetsToUse.map((subnetId) => ({
SubnetId: subnetId,
ImageId: amiIdToUse,
...ec2OverrideConfig,
}));
}
Comment on lines +232 to +237

@edersonbrilhante edersonbrilhante Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we explicitly type the map callback return as FleetLaunchTemplateOverridesRequest, consistent with the item declaration below? The current code is type-safe through the function return annotation, but the explicit annotation makes the request contract clearer.


const instanceTypesToUse = ec2OverrideConfig?.InstanceType ? [ec2OverrideConfig.InstanceType] : instancesTypes;

// Both the on-demand 'prioritized' and the spot 'capacity-optimized-prioritized' strategies
// honor the Priority field of the launch template overrides.
const usesPriority = allocationStrategy === 'prioritized' || allocationStrategy === 'capacity-optimized-prioritized';
Expand Down
Loading