From fe1867f4df0eeaf70cc666ddfdd4b37aad72f784 Mon Sep 17 00:00:00 2001 From: Justin Ashworth Date: Tue, 11 Oct 2022 17:23:31 -0400 Subject: [PATCH] CBD-5159 - Add r5, r5b, r5n and t2 instance types to AWS * Added instance types requested that were not already present --- .../couchbase-amzn-lnx2.template | 280 +++++++++++++----- aws/CouchbaseServer/deploy.sh | 8 +- .../couchbase-amzn-lnx2.template | 61 +++- .../couchbase-amzn-lnx2.template | 24 ++ 4 files changed, 280 insertions(+), 93 deletions(-) diff --git a/aws/CouchbaseServer/couchbase-amzn-lnx2.template b/aws/CouchbaseServer/couchbase-amzn-lnx2.template index 66c9b26..f64f452 100644 --- a/aws/CouchbaseServer/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseServer/couchbase-amzn-lnx2.template @@ -179,6 +179,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -204,16 +228,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] }, "CoreServices": { @@ -321,6 +336,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -346,16 +385,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] }, "EventingInstanceCount": { @@ -429,6 +459,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -454,16 +508,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] }, "SearchInstanceCount": { @@ -537,6 +582,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -562,16 +631,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] }, "BackupInstanceCount": { @@ -645,6 +705,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -670,16 +754,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] }, "DataInstanceCount": { @@ -753,6 +828,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -778,16 +877,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] }, "QueryInstanceCount": { @@ -861,6 +951,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -886,16 +1000,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] }, "IndexInstanceCount": { @@ -969,6 +1074,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -994,16 +1123,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] } }, diff --git a/aws/CouchbaseServer/deploy.sh b/aws/CouchbaseServer/deploy.sh index d43f8de..8d86da1 100755 --- a/aws/CouchbaseServer/deploy.sh +++ b/aws/CouchbaseServer/deploy.sh @@ -17,7 +17,7 @@ fi SERVER_INSTANCE_COUNT_DEFAULT=$(jq '.Parameters.CoreInstanceCount.Default' "${SCRIPT_DIR}/couchbase-amzn-lnx2.template" -r) SERVER_VERSION_DEFAULT=$(jq '.Parameters.ServerVersion.Default' "${SCRIPT_DIR}/couchbase-amzn-lnx2.template" -r) -while getopts n:c:v:k:r:u:p: flag +while getopts n:c:v:k:r:u:p:s: flag do case "${flag}" in n) STACK_NAME=${OPTARG};; @@ -27,6 +27,7 @@ do r) REGION=${OPTARG};; u) USERNAME=${OPTARG};; p) PASSWORD=${OPTARG};; + s) SERVICES=${OPTARG};; *) exit 1;; esac done @@ -38,7 +39,7 @@ SERVER_VERSION=${SERVER_VERSION:-$SERVER_VERSION_DEFAULT} KEY_NAME=${KEY_NAME:-"couchbase-${REGION}"} USERNAME=${USERNAME:-"couchbase"} PASSWORD=${PASSWORD:-"foo123!"} - +SERVICES=${SERVICES:-"\"data\,index\,query\""} ${SCRIPT_DIR}/makeArchives.sh -m "${SCRIPT_DIR}/mappings.json" \ -o "${SCRIPT_DIR}/../../build/aws/CouchbaseServer/" \ @@ -80,7 +81,8 @@ ParameterKey=SSHCIDR,ParameterValue=${SSHCIDR} \ ParameterKey=CoreInstanceCount,ParameterValue=${SERVER_INSTANCE_COUNT} \ ParameterKey=ServerVersion,ParameterValue="${SERVER_VERSION}" \ ParameterKey=VpcName,ParameterValue="${VPC_NAME}" \ -ParameterKey=Subnets,ParameterValue="${SUBNET_ID}" +ParameterKey=Subnets,ParameterValue="${SUBNET_ID}" \ +ParameterKey=CoreServices,ParameterValue="${SERVICES}" OUTPUT=$(aws cloudformation describe-stack-events --stack-name "${STACK_NAME}" | jq '.StackEvents[] | select(.ResourceType == "AWS::CloudFormation::Stack") | . | select(.ResourceStatus == "CREATE_COMPLETE" or .ResourceStatus == "ROLLBACK_COMPLETE") | .ResourceStatus ') diff --git a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template index 9ab19c1..a668e4b 100644 --- a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template @@ -108,7 +108,9 @@ "m5.xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.12xlarge", + "m5.16xlarge", "m5a.large", "m5a.xlarge", "m5a.2xlarge", @@ -155,6 +157,30 @@ "r5ad.8xlarge", "r5ad.12xlarge", "r5ad.16xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", @@ -180,16 +206,7 @@ "c5n.4xlarge", "c5n.9xlarge", "m5.8xlarge", - "m5a.8xlarge", - "r5.8xlarge", - "r5a.8xlarge", - "r5ad.large", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.8xlarge", - "r5ad.12xlarge", - "r5ad.16xlarge" + "m5a.8xlarge" ] }, "SyncGatewayInstanceType": { @@ -223,6 +240,30 @@ "r5d.xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "r4.large", "r4.xlarge", "m5a.large", diff --git a/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template index 2a9b08b..442bd46 100644 --- a/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template @@ -128,6 +128,30 @@ "r5d.xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5b.large", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5n.large", + "r5n.xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5dn.large", + "r5dn.xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "t2.large", + "t2.xlarge", + "t2.2xlarge", "r4.large", "r4.xlarge", "m5a.large",