Mas810 alpha june5

aws/bootnode-ami/prepare-bootnode-ami.sh

@@ -23,6 +23,8 @@ pip install awscli --upgrade --user
 pip install pyyaml
 pip install jaydebeapi
 pip install oauthlib==3.2.0
+pip install pymongo
+
 # Install AWS cli
 curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
 unzip -o awscliv2.zip
@@ -39,13 +41,13 @@ mv -f jq /usr/local/bin
 #dnf module install -y container-tools
 
 ## Download Openshift CLI and move to /usr/local/bin
-wget "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.10.35/openshift-client-linux-4.10.35.tar.gz"
-tar -xvf openshift-client-linux-4.10.35.tar.gz
+wget "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.12.18/openshift-client-linux-4.12.18.tar.gz"
+tar -xvf openshift-client-linux-4.12.18.tar.gz
 chmod u+x oc kubectl
 mv -f oc /usr/local/bin
 mv -f kubectl /usr/local/bin
 oc version
-rm -rf openshift-client-linux-4.10.35.tar.gz
+rm -rf openshift-client-linux-4.12.18.tar.gz
 
 
 

aws/cleanup-mas-deployment.sh

@@ -375,6 +375,17 @@ if [[ $VPC_ID != "null" ]]; then
   fi
   echo "---------------------------------------------"
 
+  # delete vpc peering connection filter as RequesterVpcInfo
+  VPCPEERID=$(aws ec2 describe-vpc-peering-connections --region ${REGION} --query "VpcPeeringConnections[?(RequesterVpcInfo.VpcId == '${VPC_ID}')].VpcPeeringConnectionId" --output text)
+  if [[ -n $VPCPEERID ]]; then
+    aws ec2 delete-vpc-peering-connection --vpc-peering-connection-id ${VPCPEERID} --region ${REGION}
+  fi
+  # delete vpc peering connection filter as AccepterVpcInfo
+  VPCPEERID=$(aws ec2 describe-vpc-peering-connections --region ${REGION} --query "VpcPeeringConnections[?(AccepterVpcInfo.VpcId == '${VPC_ID}')].VpcPeeringConnectionId" --output text)
+  if [[ -n $VPCPEERID ]]; then
+    aws ec2 delete-vpc-peering-connection --vpc-peering-connection-id ${VPCPEERID} --region ${REGION}
+  fi
+
   # Delete VPC
   aws ec2 delete-vpc --region $REGION --vpc-id $VPC_ID
 else
@@ -383,15 +394,18 @@ fi
 echo "---------------------------------------------"
 
 # Delete S3 bucket
-echo "Checking for S3 buckets"
-S3BUCKETS=$(aws s3api list-buckets --query 'Buckets[?contains(Name, `masocp-'"${UNIQ_STR}"'`) == `true`].[Name]' --output text)
+echo "Checking for S3 buckets - ${UNIQ_STR}"
+S3BUCKETS=$(aws s3api list-buckets --query 'Buckets[?contains(Name, `masocp-'"${UNIQ_STR}"'`) == `true`].[Name]' --region $REGION --output text)
 echo "S3BUCKETS = $S3BUCKETS"
 if [[ -n $S3BUCKETS ]]; then
   echo "Found S3 buckets for this AWS stack"
   for inst in $S3BUCKETS; do
-    inst=$(echo $inst | tr -d '\r\n')
-    aws s3 rb s3://$inst --force --region $REGION
-    echo "Deleted bucket $inst"
+    if [[ -n $inst ]]; then  
+      inst=$(echo $inst | tr -d '\r\n')
+      aws s3 rb s3://$inst --force --region $REGION
+      echo "Deleted bucket $inst"    
+    fi
+
   done
 else
   echo "No S3 buckets for this AWS stack"

aws/cleanup-s3-bucket.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+# Script to delete S3 buckets on AWS.
+# This script will delete S3 buckets which got created as part of MAS deployment from all the regions configured in `DELETE_S3_REGIONS` variable.
+# The script will fetch S3 buckets which are atleast 24 hours old. This is to prevent deleting S3 buckets which has an associated MAS deployment currently in-progress
+
+# Configured regions from where S3 buckets will be deleted
+DELETE_S3_REGIONS=("us-east-1" "us-east-2" "us-west-2" "ap-east-1" "ap-southeast-1" "ap-southeast-2" "ap-northeast-1" "eu-central-1" "ap-south-1" "ap-northeast-2" "ap-northeast-3" "ca-central-1" "eu-south-1" "eu-west-1" "eu-west-2" "eu-west-3" "eu-north-1" "af-south-1" "me-south-1" "sa-east-1")
+echo "======================================================"
+echo "DELETE_S3_REGIONS=${DELETE_S3_REGIONS[@]}"
+echo "======================================================" 
+date=$(date -d "24 hours ago" '+%Y-%m-%d')
+echo "Fetch S3 buckets till $date date (current_day - 1 day)"
+echo "======================================================"
+S3BUCKETS=$(aws s3api list-buckets --query 'Buckets[?contains(Name, `masocp-`) == `true` && ( CreationDate<=`'"$date"'` )].[Name]' --output text)
+echo "S3BUCKETS which contains 'masocp-' = $S3BUCKETS"
+echo "======================================================"
+for S3BUCKET in $S3BUCKETS; do
+    REGION=$(aws s3api get-bucket-location --bucket $S3BUCKET | jq -r '.LocationConstraint' )
+    if [[ " ${DELETE_S3_REGIONS[@]} " =~ " ${REGION} " ]]; then
+        echo "S3BUCKET TO BE DELETED $S3BUCKET AND ITS REGION=${REGION}  "
+        aws s3 rb s3://$S3BUCKET --force --region $REGION
+    elif [[ -z "$REGION" || "$REGION" == 'null' ]]; then
+        echo "S3BUCKET TO BE DELETED $S3BUCKET AND ITS REGION=${REGION}  "
+        aws s3 rb s3://$S3BUCKET --force  
+    fi
+done
+echo "======================================================"
+S3BUCKETS=$(aws s3api list-buckets --query 'Buckets[?contains(Name, `cf-templates-`) == `true` && ( CreationDate<=`'"$date"'` )].[Name]' --output text)
+echo "S3BUCKETS which contains 'cf-templates-' = $S3BUCKETS"
+echo "======================================================"
+for S3BUCKET in $S3BUCKETS; do
+    REGION=$(aws s3api get-bucket-location --bucket $S3BUCKET | jq -r '.LocationConstraint' )
+    if [[ " ${DELETE_S3_REGIONS[@]} " =~ " ${REGION} " ]]; then
+        echo "S3BUCKET TO BE DELETED $S3BUCKET AND ITS REGION=${REGION}  "
+        aws s3 rb s3://$S3BUCKET --force --region $REGION
+    elif [[ -z "$REGION" || "$REGION" == 'null' ]]; then
+        echo "S3BUCKET TO BE DELETED $S3BUCKET AND ITS REGION=${REGION}  "
+        aws s3 rb s3://$S3BUCKET --force  
+    fi
+done
+echo "======================================================"