Make r5.xlarge as default instance type (#33)

Signed-off-by: Rishabh Singh <sngri@amazon.com>
opensearch-project · May 31, 2023 · fce3055 · fce3055
1 parent 63d3731
commit fce3055
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -51,8 +51,8 @@ In order to deploy both the stacks the user needs to provide a set of required a
 | clientNodeCount (Optional)        | integer | Number of dedicated client nodes, default is 0                                                                                                                                                                                                                                                   |
 | ingestNodeCount (Optional)        | integer | Number of dedicated ingest nodes, default is 0                                                                                                                                                                                                                                                   |
 | mlNodeCount (Optional)            | integer | Number of dedicated machine learning nodes, default is 0                                                                                                                                                                                                                                         |
-| dataInstanceType (Optional)       | string  | EC2 instance type for data node, defaults to r5.2xlarge. See options in `lib/opensearch-config/node-config.ts` for available options. E.g., `-c dataInstanceType=m5.xlarge`                                                                                                                      |
-| mlInstanceType (Optional)         | string  | EC2 instance type for ml node, defaults to r5.2xlarge. See options in `lib/opensearch-config/node-config.ts` for available options. E.g., `-c mlInstanceType=m5.xlarge`                                                                                                                          |
+| dataInstanceType (Optional)       | string  | EC2 instance type for data node, defaults to r5.xlarge. See options in `lib/opensearch-config/node-config.ts` for available options. E.g., `-c dataInstanceType=m5.xlarge`                                                                                                                       |
+| mlInstanceType (Optional)         | string  | EC2 instance type for ml node, defaults to r5.xlarge. See options in `lib/opensearch-config/node-config.ts` for available options. E.g., `-c mlInstanceType=m5.xlarge`                                                                                                                           |
 | jvmSysProps (Optional)            | string  | A comma-separated list of key=value pairs that will be added to `jvm.options` as JVM system properties.                                                                                                                                                                                          |
 | additionalConfig (Optional)       | string  | Additional opensearch.yml config parameters passed as JSON. e.g., `--context additionalConfig='{"plugins.security.nodes_dn": ["CN=*.example.com, OU=SSL, O=Test, L=Test, C=DE", "CN=node.other.com, OU=SSL, O=Test, L=Test, C=DE"], "plugins.security.nodes_dn_dynamic_config_enabled": false}'` |
 | suffix (Optional)                 | string  | An optional string identifier to be concatenated with infra stack name.                                                                                                                                                                                                                          |

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.2xlarge');
+    return getX64InstanceTypes('r5.xlarge');
   }
   if (instanceType !== 'undefined') {
     return getArm64InstanceTypes(instanceType);
   }
-  return getArm64InstanceTypes('r6g.2xlarge');
+  return getArm64InstanceTypes('r6g.xlarge');
 };
 
 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.2xlarge',
+    InstanceType: 'r5.xlarge',
     IamInstanceProfile: {
       Ref: 'dataNodeAsgInstanceProfileEC27E8D1',
     },
@@ -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.2xlarge',
+    InstanceType: 'r5.xlarge',
     IamInstanceProfile: {
       Ref: 'seedNodeAsgInstanceProfile6F1EA4FF',
     },