Skip to content

fix: enforce static node affinity for native Helm #200

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

Merged
vigneshrajsb merged 1 commit into from
May 6, 2026
Merged

fix: enforce static node affinity for native Helm #200

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
39 changes: 39 additions & 0 deletions src/server/lib/nativeHelm/__tests__/helm.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,45 @@ describe('Native Helm', () => {
expect(customValues).toContain('ingress.ipAllowlist[1]=2.2.2.2/32');
});

it('adds static node affinity and tolerations for static org charts', async () => {
const deploy = {
uuid: 'test-uuid',
dockerImage: 'repo/app:tag',
env: {},
deployable: {
buildUUID: 'build-123',
port: 8080,
helm: {
chart: { name: 'lifecycle-app', values: [] },
docker: {
app: {},
},
},
},
build: {
commentRuntimeEnv: {},
isStatic: true,
},
} as any;

const customValues = await constructHelmCustomValues(deploy, ChartType.ORG_CHART);

expect(customValues).toContain(
'deployment.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key=eks.amazonaws.com/capacityType'
);
expect(customValues).toContain(
'deployment.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0]=ON_DEMAND'
);
expect(customValues).toContain(
'deployment.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[1].key=app-long'
);
expect(customValues).toContain(
'deployment.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[1].values[0]=lifecycle-static-env'
);
expect(customValues).toContain('deployment.tolerations[0].key=static_env');
expect(customValues).toContain('deployment.tolerations[0].value=yes');
});

it('extracts secret-backed chart values after final value precedence is applied', async () => {
mockGetAllConfigs.mockResolvedValue({
postgresql: {
Expand Down
3 changes: 3 additions & 0 deletions src/server/lib/nativeHelm/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,9 @@ export async function constructHelmCustomValueConfiguration(
`${resourceType}.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key=eks.amazonaws.com/capacityType`,
`${resourceType}.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator=In`,
`${resourceType}.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0]=ON_DEMAND`,
`${resourceType}.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[1].key=app-long`,
`${resourceType}.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[1].operator=In`,
`${resourceType}.customNodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[1].values[0]=lifecycle-static-env`,
...generateTolerationsCustomValues(`${resourceType}.tolerations`, staticEnvTolerations),
])
);
Expand Down
Loading