Skip to content

feat(tag-page-rendering)!: Remove EC2 infrastructure #16965

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
akash1810 merged 7 commits into from
Oct 23, 2026
Merged

feat(tag-page-rendering)!: Remove EC2 infrastructure #16965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edf106a
test(tag-page-rendering): Remove qualifier from test name
akash1810 Oct 19, 2026
5226c25
refactor(cdk): Simplify `ecsProps`
akash1810 Oct 19, 2026
fe8fe27
refactor(cdk): Enable provisioning of ECS only
akash1810 Oct 19, 2026
8690040
feat(tag-page-rendering)!: Remove CODE EC2 infrastructure
akash1810 Oct 19, 2026
3312ba3
feat(tag-page-rendering)!: Remove PROD EC2 infrastructure
akash1810 Oct 19, 2026
83019c4
cd(tag-page-rendering): Remove ASG deployment configuration
akash1810 Oct 19, 2026
16050ff
cd(tag-page-rendering): Define CFN deployment directly
akash1810 Oct 22, 2026
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
9 changes: 0 additions & 9 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,6 @@ jobs:
rm -r facia-rendering/*
mv facia-rendering.tar.gz facia-rendering/

- name: Compress tag-page-rendering app server files
working-directory: dotcom-rendering/target
run: |
tar -zcf tag-page-rendering.tar.gz tag-page-rendering
rm -r tag-page-rendering/*
mv tag-page-rendering.tar.gz tag-page-rendering/

- name: Compress interactive-rendering app server files
working-directory: dotcom-rendering/target
run: |
Expand All @@ -105,8 +98,6 @@ jobs:
- dotcom-rendering/target/facia-rendering
tag-page-rendering-cfn:
- dotcom-rendering/target/tag-page-rendering-cfn
tag-page-rendering:
- dotcom-rendering/target/tag-page-rendering
interactive-rendering-cfn:
- dotcom-rendering/target/interactive-rendering-cfn
interactive-rendering:
Expand Down
184 changes: 84 additions & 100 deletions dotcom-rendering/cdk/bin/cdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,88 +29,94 @@ new RenderingCDKStack(cdkApp, 'ArticleRendering-CODE', {
guApp: 'article-rendering',
stage: 'CODE',
domainName: 'article-rendering.code.dev-guardianapis.com',
scaling: { minimumInstances: 1, maximumInstances: 3 },
instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.SMALL),
ec2Props: {
scaling: { minimumInstances: 1, maximumInstances: 3 },
instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.SMALL),
},
});
new RenderingCDKStack(cdkApp, 'ArticleRendering-PROD', {
guApp: 'article-rendering',
stage: 'PROD',
domainName: 'article-rendering.guardianapis.com',
scaling: {
minimumInstances: 42,
maximumInstances: 240,
policies: {
step: {
cpu: cpuScalingSteps,
latency: {
scalingStepsOut: [
// When latency is lower than 0.2s no scaling up
{ lower: 0, upper: 0.2, change: 0 },
// When latency is higher than 0.2s we scale up by 50%
{ lower: 0.2, change: 50 },
// When latency is higher than 0.3s we scale up by 80%
{ lower: 0.3, change: 80 },
],
scalingStepsIn: [
// When latency is higher than 0.12s no scaling down
{ lower: 0.12, change: 0 },
// When latency is lower than 0.12s we scale down by 1
{ upper: 0.12, lower: 0, change: -1 },
],
ec2Props: {
scaling: {
minimumInstances: 42,
maximumInstances: 240,
policies: {
step: {
cpu: cpuScalingSteps,
latency: {
scalingStepsOut: [
// When latency is lower than 0.2s no scaling up
{ lower: 0, upper: 0.2, change: 0 },
// When latency is higher than 0.2s we scale up by 50%
{ lower: 0.2, change: 50 },
// When latency is higher than 0.3s we scale up by 80%
{ lower: 0.3, change: 80 },
],
scalingStepsIn: [
// When latency is higher than 0.12s no scaling down
{ lower: 0.12, change: 0 },
// When latency is lower than 0.12s we scale down by 1
{ upper: 0.12, lower: 0, change: -1 },
],
},
},
},
},
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
},
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
});

/** Facia */
new RenderingCDKStack(cdkApp, 'FaciaRendering-CODE', {
guApp: 'facia-rendering',
stage: 'CODE',
domainName: 'facia-rendering.code.dev-guardianapis.com',
scaling: { minimumInstances: 1, maximumInstances: 3 },
instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.SMALL),
ec2Props: {
scaling: { minimumInstances: 1, maximumInstances: 3 },
instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.SMALL),
},
});
new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
guApp: 'facia-rendering',
stage: 'PROD',
domainName: 'facia-rendering.guardianapis.com',
scaling: {
minimumInstances: 21,
maximumInstances: 210,
policies: {
step: {
cpu: cpuScalingSteps,
latency: {
scalingStepsOut: [
// When latency is lower than 0.4s no scaling up
{ lower: 0, upper: 0.4, change: 0 },
// When latency is higher than 0.4s we scale up by 50%
{ lower: 0.4, change: 50 },
// When latency is higher than 0.5s we scale up by 80%
{ lower: 0.5, change: 80 },
],
scalingStepsIn: [
// When latency is higher than 0.35s no scaling down
{ lower: 0.35, change: 0 },
// When latency is lower than 0.35s we scale down by 1
{ upper: 0.35, lower: 0, change: -1 },
],
ec2Props: {
scaling: {
minimumInstances: 21,
maximumInstances: 210,
policies: {
step: {
cpu: cpuScalingSteps,
latency: {
scalingStepsOut: [
// When latency is lower than 0.4s no scaling up
{ lower: 0, upper: 0.4, change: 0 },
// When latency is higher than 0.4s we scale up by 50%
{ lower: 0.4, change: 50 },
// When latency is higher than 0.5s we scale up by 80%
{ lower: 0.5, change: 80 },
],
scalingStepsIn: [
// When latency is higher than 0.35s no scaling down
{ lower: 0.35, change: 0 },
// When latency is lower than 0.35s we scale down by 1
{ upper: 0.35, lower: 0, change: -1 },
],
},
},
},
},
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
},
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
});

/** Tag pages */
export const TagPageRenderingPropsCODE: RenderingCDKStackProps = {
guApp: 'tag-page-rendering',
stage: 'CODE',
domainName: 'tag-page-rendering.code.dev-guardianapis.com',
scaling: { minimumInstances: 0, maximumInstances: 0 },
instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.SMALL),
ecsProps: {
imageIdentifier: getImageIdentifier(),
taskCpu: 1024,
Expand Down Expand Up @@ -143,32 +149,6 @@ export const TagPageRenderingPropsPROD: RenderingCDKStackProps = {
guApp: 'tag-page-rendering',
stage: 'PROD',
domainName: 'tag-page-rendering.guardianapis.com',
scaling: {
minimumInstances: 0,
maximumInstances: 0,
policies: {
step: {
cpu: cpuScalingSteps,
latency: {
scalingStepsOut: [
// When latency is lower than 0.4s no scaling up
{ lower: 0, upper: 0.4, change: 0 },
// When latency is higher than 0.4s we scale up by 50%
{ lower: 0.4, change: 50 },
// When latency is higher than 0.5s we scale up by 80%
{ lower: 0.5, change: 80 },
],
scalingStepsIn: [
// When latency is higher than 0.35s no scaling down
{ lower: 0.35, change: 0 },
// When latency is lower than 0.35s we scale down by 1
{ upper: 0.35, lower: 0, change: -1 },
],
},
},
},
},
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
ecsProps: {
imageIdentifier: getImageIdentifier(),
taskCpu: 1024,
Expand Down Expand Up @@ -203,8 +183,10 @@ export const InteractiveRenderingPropsCODE: RenderingCDKStackProps = {
guApp: 'interactive-rendering',
stage: 'CODE',
domainName: 'interactive-rendering.code.dev-guardianapis.com',
scaling: { minimumInstances: 1, maximumInstances: 3 },
instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.MICRO),
ec2Props: {
scaling: { minimumInstances: 1, maximumInstances: 3 },
instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.MICRO),
},
ecsProps: {
imageIdentifier: getImageIdentifier(),
taskCpu: 1024,
Expand Down Expand Up @@ -239,32 +221,34 @@ export const InteractiveRenderingPropsPROD: RenderingCDKStackProps = {
guApp: 'interactive-rendering',
stage: 'PROD',
domainName: 'interactive-rendering.guardianapis.com',
scaling: {
minimumInstances: 3,
maximumInstances: 30,
policies: {
step: {
cpu: cpuScalingSteps,
latency: {
scalingStepsOut: [
// When latency is lower than 0.2s no scaling up
{ lower: 0, upper: 0.2, change: 0 },
// When latency is higher than 0.2s we scale up by 50%
{ lower: 0.2, change: 50 },
// When latency is higher than 0.3s we scale up by 80%
{ lower: 0.3, change: 80 },
],
scalingStepsIn: [
// When latency is higher than 0.15s no scaling down
{ lower: 0.15, change: 0 },
// When latency is lower than 0.15s we scale down by 1
{ upper: 0.15, lower: 0, change: -1 },
],
ec2Props: {
scaling: {
minimumInstances: 3,
maximumInstances: 30,
policies: {
step: {
cpu: cpuScalingSteps,
latency: {
scalingStepsOut: [
// When latency is lower than 0.2s no scaling up
{ lower: 0, upper: 0.2, change: 0 },
// When latency is higher than 0.2s we scale up by 50%
{ lower: 0.2, change: 50 },
// When latency is higher than 0.3s we scale up by 80%
{ lower: 0.3, change: 80 },
],
scalingStepsIn: [
// When latency is higher than 0.15s no scaling down
{ lower: 0.15, change: 0 },
// When latency is lower than 0.15s we scale down by 1
{ upper: 0.15, lower: 0, change: -1 },
],
},
},
},
},
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
},
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
};
new RenderingCDKStack(
cdkApp,
Expand Down
Loading
Loading