feat: Migrate from t2 to t3 instance family (#31)

AWSinAction · Apr 24, 2024 · e8131b2 · e8131b2
1 parent 3c0e48f
commit e8131b2
Show file tree

Hide file tree

Showing 40 changed files with 63 additions and 63 deletions.
diff --git a/chapter02/template.yaml b/chapter02/template.yaml
@@ -192,7 +192,7 @@ Resources:
     Properties:
       AllocatedStorage: 5
       BackupRetentionPeriod: 0
-      DBInstanceClass: 'db.t2.micro'
+      DBInstanceClass: 'db.t3.micro'
       DBName: wordpress
       Engine: MySQL
       MasterUsername: wordpress
@@ -371,7 +371,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0

diff --git a/chapter04/nodecc/lib/createVM.js b/chapter04/nodecc/lib/createVM.js
@@ -11,7 +11,7 @@ module.exports = (amiId, subnetId, cb) => {
     ImageId: amiId,
     MinCount: 1,
     MaxCount: 1,
-    InstanceType: 't2.micro',
+    InstanceType: 't3.micro',
     SubnetId: subnetId
   }, (err) => {
     if (err) {

diff --git a/chapter04/virtualmachine.ps1 b/chapter04/virtualmachine.ps1
@@ -11,7 +11,7 @@ $ErrorActionPreference = "Stop"
 $AMIID=aws ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.202*-x86_64-gp2" --query "Images[0].ImageId" --output text
 $VPCID=aws ec2 describe-vpcs --filter "Name=isDefault, Values=true" --query "Vpcs[0].VpcId" --output text
 $SUBNETID=aws ec2 describe-subnets --filters "Name=vpc-id, Values=$VPCID" --query "Subnets[0].SubnetId" --output text
-$INSTANCEID=aws ec2 run-instances --image-id $AMIID --instance-type t2.micro --subnet-id $SUBNETID --iam-instance-profile "Name=ec2-ssm-core" --query "Instances[0].InstanceId" --output text
+$INSTANCEID=aws ec2 run-instances --image-id $AMIID --instance-type t3.micro --subnet-id $SUBNETID --iam-instance-profile "Name=ec2-ssm-core" --query "Instances[0].InstanceId" --output text
 Write-Host "waiting for $INSTANCEID ..."
 aws ec2 wait instance-running --instance-ids $INSTANCEID
 Write-Host "$INSTANCEID is up and running"

diff --git a/chapter04/virtualmachine.sh b/chapter04/virtualmachine.sh
@@ -3,7 +3,7 @@
 AMIID="$(aws ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.202*-x86_64-gp2" --query "Images[0].ImageId" --output text)"
 VPCID="$(aws ec2 describe-vpcs --filter "Name=isDefault, Values=true" --query "Vpcs[0].VpcId" --output text)"
 SUBNETID="$(aws ec2 describe-subnets --filters "Name=vpc-id, Values=$VPCID" --query "Subnets[0].SubnetId" --output text)"
-INSTANCEID="$(aws ec2 run-instances --image-id "$AMIID" --instance-type t2.micro --subnet-id "$SUBNETID" --iam-instance-profile "Name=ec2-ssm-core" --query "Instances[0].InstanceId" --output text)"
+INSTANCEID="$(aws ec2 run-instances --image-id "$AMIID" --instance-type t3.micro --subnet-id "$SUBNETID" --iam-instance-profile "Name=ec2-ssm-core" --query "Instances[0].InstanceId" --output text)"
 echo "waiting for $INSTANCEID ..."
 aws ec2 wait instance-running --instance-ids "$INSTANCEID"
 echo "$INSTANCEID is up and running"

diff --git a/chapter04/virtualmachine.yaml b/chapter04/virtualmachine.yaml
@@ -11,8 +11,8 @@ Parameters:
   InstanceType:
     Description: 'Select one of the possible instance types'
     Type: String
-    Default: 't2.micro'
-    AllowedValues: ['t2.micro', 't2.small', 't2.medium']
+    Default: 't3.micro'
+    AllowedValues: ['t3.micro', 't3.small', 't3.medium']
 Mappings:
   RegionMap:
     'eu-north-1':

diff --git a/chapter05/ec2-iam-role.yaml b/chapter05/ec2-iam-role.yaml
@@ -94,7 +94,7 @@ Resources:
     Properties:
       IamInstanceProfile: !Ref InstanceProfile
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       SecurityGroupIds:
       - !Ref SecurityGroup
       SubnetId: !Ref Subnet

diff --git a/chapter05/ec2-os-update.yaml b/chapter05/ec2-os-update.yaml
@@ -92,7 +92,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile
       SecurityGroupIds:
       - !Ref SecurityGroup

diff --git a/chapter05/ec2-yum-update.yaml b/chapter05/ec2-yum-update.yaml
@@ -77,7 +77,7 @@ Resources:
     Properties:
       IamInstanceProfile: !Ref InstanceProfile
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       SecurityGroupIds:
       - !Ref SecurityGroup
       SubnetId: !Ref Subnet

diff --git a/chapter05/firewall1.yaml b/chapter05/firewall1.yaml
@@ -74,7 +74,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       SecurityGroupIds:
       - !Ref SecurityGroup

diff --git a/chapter05/firewall2.yaml b/chapter05/firewall2.yaml
@@ -80,7 +80,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       SecurityGroupIds:
       - !Ref SecurityGroup

diff --git a/chapter05/firewall3.yaml b/chapter05/firewall3.yaml
@@ -85,7 +85,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       SecurityGroupIds:
       - !Ref SecurityGroup

diff --git a/chapter05/firewall4.yaml b/chapter05/firewall4.yaml
@@ -90,7 +90,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       SecurityGroupIds:
       - !Ref SecurityGroup

diff --git a/chapter05/firewall5.yaml b/chapter05/firewall5.yaml
@@ -99,7 +99,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       SecurityGroupIds:
       - !Ref SecurityGroupProxy
@@ -187,7 +187,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       SecurityGroupIds:
       - !Ref SecurityGroupBackend

diff --git a/chapter05/vpc.yaml b/chapter05/vpc.yaml
@@ -397,7 +397,7 @@ Resources:
     Type: AWS::EC2::Instance
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       SecurityGroupIds:
       - !Ref SecurityGroup
@@ -485,7 +485,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       SecurityGroupIds:
       - !Ref SecurityGroup

diff --git a/chapter08/ebs.yaml b/chapter08/ebs.yaml
@@ -96,7 +96,7 @@ Resources:
     Properties:
       IamInstanceProfile: !Ref InstanceProfile # instead of ec2-ssm-core we use a instance profile created in the same template for testability
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       SecurityGroupIds:
       - !Ref SecurityGroup
       SubnetId: !Ref Subnet

diff --git a/chapter09/efs-backup.yaml b/chapter09/efs-backup.yaml
@@ -222,7 +222,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref IamInstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true
@@ -268,7 +268,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref IamInstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true

diff --git a/chapter09/efs-provisioned.yaml b/chapter09/efs-provisioned.yaml
@@ -223,7 +223,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref IamInstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true
@@ -269,7 +269,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref IamInstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true

diff --git a/chapter09/efs.yaml b/chapter09/efs.yaml
@@ -222,7 +222,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref IamInstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true
@@ -268,7 +268,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref IamInstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true

diff --git a/chapter10/template-multiaz.yaml b/chapter10/template-multiaz.yaml
@@ -193,7 +193,7 @@ Resources:
       AllocatedStorage: 5
       BackupRetentionPeriod: 3
       PreferredBackupWindow: '05:00-06:00'
-      DBInstanceClass: 'db.t2.micro'
+      DBInstanceClass: 'db.t3.micro'
       DBName: wordpress
       Engine: MySQL
       MasterUsername: wordpress
@@ -373,7 +373,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0

diff --git a/chapter10/template-snapshot.yaml b/chapter10/template-snapshot.yaml
@@ -193,7 +193,7 @@ Resources:
       AllocatedStorage: 5
       BackupRetentionPeriod: 3
       PreferredBackupWindow: '05:00-06:00'
-      DBInstanceClass: 'db.t2.micro'
+      DBInstanceClass: 'db.t3.micro'
       DBName: wordpress
       Engine: MySQL
       MasterUsername: wordpress
@@ -372,7 +372,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0

diff --git a/chapter10/template.yaml b/chapter10/template.yaml
@@ -192,7 +192,7 @@ Resources:
     Properties:
       AllocatedStorage: 5
       BackupRetentionPeriod: 0
-      DBInstanceClass: 'db.t2.micro'
+      DBInstanceClass: 'db.t3.micro'
       DBName: wordpress
       Engine: MySQL
       MasterUsername: wordpress
@@ -371,7 +371,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0

diff --git a/chapter11/discourse.yaml b/chapter11/discourse.yaml
@@ -146,7 +146,7 @@ Resources:
   Cache:
     Type: 'AWS::ElastiCache::CacheCluster'
     Properties:
-      CacheNodeType: 'cache.t2.micro'
+      CacheNodeType: 'cache.t3.micro'
       CacheSubnetGroupName: !Ref CacheSubnetGroup
       Engine: redis
       EngineVersion: '6.2'
@@ -184,7 +184,7 @@ Resources:
     Properties:
       AllocatedStorage: 5
       BackupRetentionPeriod: 0
-      DBInstanceClass: 'db.t2.micro'
+      DBInstanceClass: 'db.t3.micro'
       DBName: discourse
       Engine: postgres
       EngineVersion: '12.15'
@@ -267,7 +267,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true
@@ -285,7 +285,7 @@ Resources:
         'Fn::Base64': !Sub |
           #!/bin/bash -x
           bash -ex << "TRY"
-            # t2.micro may not have enough memory, so we add a 1024MB swapfile
+            # t3.micro may not have enough memory, so we add a 1024MB swapfile
             dd if=/dev/zero of=/swapfile1 bs=1024 count=1048576
             chmod 0600 /swapfile1
             mkswap /swapfile1

diff --git a/chapter11/memorydb-minimal.yaml b/chapter11/memorydb-minimal.yaml
@@ -218,7 +218,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true

diff --git a/chapter11/redis-minimal.yaml b/chapter11/redis-minimal.yaml
@@ -68,7 +68,7 @@ Resources:
   Cache:
     Type: 'AWS::ElastiCache::CacheCluster'
     Properties:
-      CacheNodeType: 'cache.t2.micro'
+      CacheNodeType: 'cache.t3.micro'
       CacheSubnetGroupName: !Ref CacheSubnetGroup
       Engine: redis
       NumCacheNodes: 1
@@ -109,7 +109,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref InstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true

diff --git a/chapter13/multiaz-efs-eip.yaml b/chapter13/multiaz-efs-eip.yaml
@@ -201,7 +201,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0

diff --git a/chapter13/multiaz-efs.yaml b/chapter13/multiaz-efs.yaml
@@ -191,7 +191,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0

diff --git a/chapter13/multiaz.yaml b/chapter13/multiaz.yaml
@@ -159,7 +159,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0

diff --git a/chapter13/recovery.yaml b/chapter13/recovery.yaml
@@ -149,7 +149,7 @@ Resources:
     Type: 'AWS::EC2::Instance'
     Properties:
       ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
-      InstanceType: 't2.micro'
+      InstanceType: 't3.micro'
       IamInstanceProfile: !Ref IamInstanceProfile
       NetworkInterfaces:
       - AssociatePublicIpAddress: true

diff --git a/chapter14/loadbalancer.yaml b/chapter14/loadbalancer.yaml
@@ -239,7 +239,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0

diff --git a/chapter15/cloudformation.yaml b/chapter15/cloudformation.yaml
@@ -207,7 +207,7 @@ Resources:
         ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI]
         Monitoring:
           Enabled: false
-        InstanceType: 't2.micro'
+        InstanceType: 't3.micro'
         NetworkInterfaces:
         - AssociatePublicIpAddress: true
           DeviceIndex: 0
@@ -287,7 +287,7 @@ Resources:
     Properties:
       AllocatedStorage: 5
       BackupRetentionPeriod: 0
-      DBInstanceClass: 'db.t2.micro'
+      DBInstanceClass: 'db.t3.micro'
       DBName: etherpad
       Engine: MySQL
       MasterUsername: etherpad