From fdad95b4b9aaaae278556e7409fb010cf4f30249 Mon Sep 17 00:00:00 2001 From: way zheng Date: Sat, 20 Dec 2025 18:09:15 -0800 Subject: [PATCH 1/3] update euid CF template and desc --- scripts/aws/EUID_CloudFormation.template.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/aws/EUID_CloudFormation.template.yml b/scripts/aws/EUID_CloudFormation.template.yml index 09fefb18f..22a8f5da0 100644 --- a/scripts/aws/EUID_CloudFormation.template.yml +++ b/scripts/aws/EUID_CloudFormation.template.yml @@ -38,6 +38,8 @@ Parameters: - m6i.4xlarge - r6i.2xlarge - r6i.4xlarge + - r7i.2xlarge + - r7i.4xlarge ConstraintDescription: must be a valid EC2 instance type. RootVolumeSize: Description: Instance root volume size @@ -90,7 +92,7 @@ Metadata: DeployToEnvironment: default: EUID environment to deploy to. Prod - production; Integ - integration test. InstanceType: - default: Instance Type for EC2. Minimum 4 vCPUs needed. M5, M5a, M5n, M6i and R6i Instance types are tested. Choose 2xlarge or 4xlarge. + default: Instance Type for EC2. Minimum 4 vCPUs needed. M5, M5a, M5n, M6i, R6i and R7i Instance types are tested. Choose 2xlarge or 4xlarge. SSHKeyName: default: Key Name for SSH to EC2 (required) RootVolumeSize: From 60903a1f48b731b7fcf0b31ba2829f7569bdd404 Mon Sep 17 00:00:00 2001 From: way zheng Date: Fri, 26 Dec 2025 14:23:38 -0800 Subject: [PATCH 2/3] update the CF to include correct cpu reqirements --- scripts/aws/EUID_CloudFormation.template.yml | 2 +- scripts/aws/UID_CloudFormation.template.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/aws/EUID_CloudFormation.template.yml b/scripts/aws/EUID_CloudFormation.template.yml index 22a8f5da0..30f12aea4 100644 --- a/scripts/aws/EUID_CloudFormation.template.yml +++ b/scripts/aws/EUID_CloudFormation.template.yml @@ -92,7 +92,7 @@ Metadata: DeployToEnvironment: default: EUID environment to deploy to. Prod - production; Integ - integration test. InstanceType: - default: Instance Type for EC2. Minimum 4 vCPUs needed. M5, M5a, M5n, M6i, R6i and R7i Instance types are tested. Choose 2xlarge or 4xlarge. + default: Instance Type for EC2. Minimum 8 vCPUs needed. M5, M5a, M5n, M6i, R6i and R7i Instance types are tested. Choose 2xlarge or 4xlarge. SSHKeyName: default: Key Name for SSH to EC2 (required) RootVolumeSize: diff --git a/scripts/aws/UID_CloudFormation.template.yml b/scripts/aws/UID_CloudFormation.template.yml index 58030f4d2..82ab2c1dc 100644 --- a/scripts/aws/UID_CloudFormation.template.yml +++ b/scripts/aws/UID_CloudFormation.template.yml @@ -92,7 +92,7 @@ Metadata: DeployToEnvironment: default: UID2 environment to deploy to. Prod - production; Integ - integration test. InstanceType: - default: Instance Type for EC2. Minimum 4 vCPUs needed. M5, M5a, M5n, M6i and R6i Instance types are tested. Choose 2xlarge or 4xlarge. + default: Instance Type for EC2. Minimum 8 vCPUs needed. M5, M5a, M5n, M6i, R6i and R7i Instance types are tested. Choose 2xlarge or 4xlarge. SSHKeyName: default: Key Name for SSH to EC2 (required) RootVolumeSize: From 93ad19308b7533b511f72a6125c83ad459450edd Mon Sep 17 00:00:00 2001 From: way zheng Date: Fri, 26 Dec 2025 15:37:12 -0800 Subject: [PATCH 3/3] update aks and azure cpu and memeory requriements to align --- scripts/azure-aks/deployment/operator.yaml | 6 +++++- scripts/azure-cc/deployment/operator.json | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/azure-aks/deployment/operator.yaml b/scripts/azure-aks/deployment/operator.yaml index 234bd4a23..bc6e752d6 100644 --- a/scripts/azure-aks/deployment/operator.yaml +++ b/scripts/azure-aks/deployment/operator.yaml @@ -39,7 +39,11 @@ spec: image: IMAGE_PLACEHOLDER resources: limits: - memory: "8Gi" + cpu: "6" + memory: "24Gi" + requests: + cpu: "6" + memory: "24Gi" imagePullPolicy: Always securityContext: runAsUser: 1000 diff --git a/scripts/azure-cc/deployment/operator.json b/scripts/azure-cc/deployment/operator.json index 43d395c1b..60cf08d11 100644 --- a/scripts/azure-cc/deployment/operator.json +++ b/scripts/azure-cc/deployment/operator.json @@ -116,8 +116,8 @@ ], "resources": { "requests": { - "cpu": 3.5, - "memoryInGB": 15.5 + "cpu": 6, + "memoryInGB": 24 } }, "environmentVariables": [