This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 530392b add new shapes for apache spark on aws
new d5c01cd Merge pull request #1466 from denysyankiv/DATALAB-2722
530392b is described below
commit 530392ba8d683578aa1caa642b0667af89072c6a
Author: Denys Yankiv <[email protected]>
AuthorDate: Fri Mar 18 17:16:32 2022 +0200
add new shapes for apache spark on aws
---
.../src/general/files/aws/dataengine_description.json | 2 ++
.../src/ssn/files/aws/mongo_roles.json | 10 ++++++++++
.../src/main/resources/mongo/aws/mongo_roles.json | 12 ++++++++++++
3 files changed, 24 insertions(+)
diff --git
a/infrastructure-provisioning/src/general/files/aws/dataengine_description.json
b/infrastructure-provisioning/src/general/files/aws/dataengine_description.json
index 3594e96..f6b772a 100644
---
a/infrastructure-provisioning/src/general/files/aws/dataengine_description.json
+++
b/infrastructure-provisioning/src/general/files/aws/dataengine_description.json
@@ -5,6 +5,7 @@
"computation_resources_shapes":
{
"For testing" : [
+ {"Size": "S", "Description": "c4.large", "Type": "c4.large","Ram":
"3.75 GB","Cpu": "2"},
{"Size": "S", "Description": "c4.xlarge", "Type": "c4.xlarge","Ram":
"7.5 GB","Cpu": "4"}
],
"Memory optimized" : [
@@ -14,6 +15,7 @@
{"Size": "L", "Description": "r3.8xlarge", "Type": "r3.8xlarge","Ram":
"244 GB","Cpu": "32"}
],
"Compute optimized": [
+ {"Size": "S", "Description": "c4.large", "Type": "c4.large","Ram":
"3.75 GB","Cpu": "2"},
{"Size": "S", "Description": "c4.xlarge", "Type": "c4.xlarge","Ram":
"7.5 GB","Cpu": "4"},
{"Size": "M", "Description": "c4.2xlarge", "Type": "c4.2xlarge","Ram":
"15.0 GB","Cpu": "8"},
{"Size": "L", "Description": "c4.8xlarge", "Type": "c4.8xlarge","Ram":
"60.0 GB","Cpu": "36"}
diff --git a/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json
b/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json
index 97759c6..42666d0 100644
--- a/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json
+++ b/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json
@@ -190,6 +190,16 @@
]
},
{
+ "_id": "compShapes_c4.large_fetching",
+ "description": "Use c4.large instance shape for cluster",
+ "computational_shapes": [
+ "c4.large"
+ ],
+ "groups": [
+ "$anyuser"
+ ]
+ },
+ {
"_id": "compShapes_c4.xlarge_fetching",
"description": "Use c4.xlarge instance shape for cluster",
"computational_shapes": [
diff --git
a/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
b/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
index 03b804b..ec8f699 100644
--- a/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
+++ b/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
@@ -228,6 +228,18 @@
]
},
{
+ "_id": "compShapes_c4.large_fetching",
+ "description": "Use c4.large instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
+ "cloud": "AWS",
+ "computational_shapes": [
+ "c4.large"
+ ],
+ "groups": [
+ "$anyuser"
+ ]
+ },
+ {
"_id": "compShapes_c4.xlarge_fetching",
"description": "Use c4.xlarge instance shape for cluster",
"type": "COMPUTATIONAL_SHAPE",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
