make r5.2xlarge as default instance type

Signed-off-by: Rishabh Singh <sngri@amazon.com>
opensearch-project · May 30, 2023 · 6d803c8 · 6d803c8
1 parent 465f824
commit 6d803c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/opensearch-config/node-config.ts b/lib/opensearch-config/node-config.ts
@@ -44,6 +44,7 @@ export enum x64Ec2InstanceType {
   C5_XLARGE = 'c5.xlarge',
   R5_LARGE = 'r5.large',
   R5_XLARGE = 'r5.xlarge',
+  R5_2XLARGE = 'r5.2xlarge',
   G5_LARGE = 'g5.large',
   G5_XLARGE = 'g5.xlarge',
   INF1_XLARGE = 'inf1.xlarge',
@@ -57,6 +58,7 @@ export enum arm64Ec2InstanceType {
   C6G_XLARGE = 'c6g.xlarge',
   R6G_LARGE = 'r6g.large',
   R6G_XLARGE = 'r6g.xlarge',
+  R6G_2XLARGE = 'r6g.2xlarge',
   G5G_LARGE = 'g5g.large',
   G5G_XLARGE = 'g5g.xlarge'
 }
@@ -75,6 +77,8 @@ export const getX64InstanceTypes = (instanceType: string) => {
     return InstanceType.of(InstanceClass.R5, InstanceSize.LARGE);
   case x64Ec2InstanceType.R5_XLARGE:
     return InstanceType.of(InstanceClass.R5, InstanceSize.XLARGE);
+  case x64Ec2InstanceType.R5_2XLARGE:
+    return InstanceType.of(InstanceClass.R5, InstanceSize.XLARGE2);
   case x64Ec2InstanceType.G5_LARGE:
     return InstanceType.of(InstanceClass.G5, InstanceSize.LARGE);
   case x64Ec2InstanceType.G5_XLARGE:
@@ -102,6 +106,8 @@ export const getArm64InstanceTypes = (instanceType: string) => {
     return InstanceType.of(InstanceClass.R6G, InstanceSize.LARGE);
   case arm64Ec2InstanceType.R6G_XLARGE:
     return InstanceType.of(InstanceClass.R6G, InstanceSize.XLARGE);
+  case arm64Ec2InstanceType.R6G_2XLARGE:
+    return InstanceType.of(InstanceClass.R6G, InstanceSize.XLARGE2);
   case arm64Ec2InstanceType.G5G_LARGE:
     return InstanceType.of(InstanceClass.G5G, InstanceSize.LARGE);
   case arm64Ec2InstanceType.G5G_XLARGE:

diff --git a/lib/os-cluster-entrypoint.ts b/lib/os-cluster-entrypoint.ts
@@ -27,12 +27,12 @@ const getInstanceType = (instanceType: string, arch: string) => {
     if (instanceType !== 'undefined') {
       return getX64InstanceTypes(instanceType);
     }
-    return getX64InstanceTypes('r5.large');
+    return getX64InstanceTypes('r5.2xlarge');
   }
   if (instanceType !== 'undefined') {
     return getArm64InstanceTypes(instanceType);
   }
-  return getArm64InstanceTypes('r6g.large');
+  return getArm64InstanceTypes('r6g.2xlarge');
 };
 
 export class OsClusterEntrypoint {

diff --git a/test/os-cluster.test.ts b/test/os-cluster.test.ts
@@ -54,7 +54,7 @@ test('Test Resources with security disabled multi-node default instance types',
     Protocol: 'TCP',
   });
   infraTemplate.hasResourceProperties('AWS::AutoScaling::LaunchConfiguration', {
-    InstanceType: 'r5.large',
+    InstanceType: 'r5.2xlarge',
     IamInstanceProfile: {
       Ref: 'dataNodeAsgInstanceProfileEC27E8D1',
     },
@@ -227,7 +227,7 @@ test('Throw error on wrong cpu arch to instance mapping', () => {
   } catch (error) {
     expect(error).toBeInstanceOf(Error);
     // eslint-disable-next-line max-len
-    expect(error.message).toEqual('Invalid instance type provided, please provide any one the following: m6g.xlarge,m6g.2xlarge,c6g.large,c6g.xlarge,r6g.large,r6g.xlarge,g5g.large,g5g.xlarge');
+    expect(error.message).toEqual('Invalid instance type provided, please provide any one the following: m6g.xlarge,m6g.2xlarge,c6g.large,c6g.xlarge,r6g.large,r6g.xlarge,r6g.2xlarge,g5g.large,g5g.xlarge');
   }
 });
 
@@ -259,7 +259,7 @@ test('Throw error on ec2 instance outside of enum list', () => {
   } catch (error) {
     expect(error).toBeInstanceOf(Error);
     // eslint-disable-next-line max-len
-    expect(error.message).toEqual('Invalid instance type provided, please provide any one the following: m5.xlarge,m5.2xlarge,c5.large,c5.xlarge,r5.large,r5.xlarge,g5.large,g5.xlarge,inf1.xlarge,inf1.2xlarge');
+    expect(error.message).toEqual('Invalid instance type provided, please provide any one the following: m5.xlarge,m5.2xlarge,c5.large,c5.xlarge,r5.large,r5.xlarge,r5.2xlarge,g5.large,g5.xlarge,inf1.xlarge,inf1.2xlarge');
   }
 });
 
@@ -292,7 +292,7 @@ test('Test multi-node cluster with only data-nodes', () => {
   infraTemplate.resourceCountIs('AWS::AutoScaling::AutoScalingGroup', 2);
   infraTemplate.resourceCountIs('AWS::AutoScaling::LaunchConfiguration', 2);
   infraTemplate.hasResourceProperties('AWS::AutoScaling::LaunchConfiguration', {
-    InstanceType: 'r5.large',
+    InstanceType: 'r5.2xlarge',
     IamInstanceProfile: {
       Ref: 'seedNodeAsgInstanceProfile6F1EA4FF',
     },