From e8131b2a740d22cd5d487aa30d242336421c496e Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Wed, 24 Apr 2024 16:09:46 +0200 Subject: [PATCH] feat: Migrate from t2 to t3 instance family (#31) --- chapter02/template.yaml | 4 ++-- chapter04/nodecc/lib/createVM.js | 2 +- chapter04/virtualmachine.ps1 | 2 +- chapter04/virtualmachine.sh | 2 +- chapter04/virtualmachine.yaml | 4 ++-- chapter05/ec2-iam-role.yaml | 2 +- chapter05/ec2-os-update.yaml | 2 +- chapter05/ec2-yum-update.yaml | 2 +- chapter05/firewall1.yaml | 2 +- chapter05/firewall2.yaml | 2 +- chapter05/firewall3.yaml | 2 +- chapter05/firewall4.yaml | 2 +- chapter05/firewall5.yaml | 4 ++-- chapter05/vpc.yaml | 4 ++-- chapter08/ebs.yaml | 2 +- chapter09/efs-backup.yaml | 4 ++-- chapter09/efs-provisioned.yaml | 4 ++-- chapter09/efs.yaml | 4 ++-- chapter10/template-multiaz.yaml | 4 ++-- chapter10/template-snapshot.yaml | 4 ++-- chapter10/template.yaml | 4 ++-- chapter11/discourse.yaml | 8 ++++---- chapter11/memorydb-minimal.yaml | 2 +- chapter11/redis-minimal.yaml | 4 ++-- chapter13/multiaz-efs-eip.yaml | 2 +- chapter13/multiaz-efs.yaml | 2 +- chapter13/multiaz.yaml | 2 +- chapter13/recovery.yaml | 2 +- chapter14/loadbalancer.yaml | 2 +- chapter15/cloudformation.yaml | 4 ++-- chapter15/codedeploy.yaml | 4 ++-- chapter15/etherpad.pkr.hcl | 2 +- chapter15/packer.yaml | 4 ++-- chapter16/imagery.pkr.hcl | 2 +- chapter16/template.yaml | 4 ++-- chapter17/url2png-loadtest.yaml | 4 ++-- chapter17/url2png.yaml | 2 +- chapter17/wordpress-loadtest.yaml | 6 +++--- chapter17/wordpress-schedule.yaml | 4 ++-- chapter17/wordpress.yaml | 4 ++-- 40 files changed, 63 insertions(+), 63 deletions(-) diff --git a/chapter02/template.yaml b/chapter02/template.yaml index 78f0799..20781a3 100644 --- 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 index 15175ae..55c42af 100644 --- 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 index 346fe2d..384e7fd 100644 --- 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 index 01e7a3d..1772af9 100755 --- 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 index d561b3f..6a721cb 100644 --- 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 index a1cc48b..5a0fffd 100644 --- 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 index b496396..864a573 100644 --- 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 index 4f870f7..e330380 100644 --- 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 index ef2ace4..bd1b682 100644 --- 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 index b5aae1f..da2a200 100644 --- 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 index 09373f9..69abd54 100644 --- 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 index a7d7cea..5ab1992 100644 --- 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 index c724a40..dc45261 100644 --- 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 index fe2e231..6013af3 100644 --- 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 index 2fde9ea..e0cb021 100644 --- 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 index bc32e54..ae2ac5a 100644 --- 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 index 9b34ed0..9dac4ec 100644 --- 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 index 998a3e4..f6df296 100644 --- 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 index 4fbfcba..ed9aec7 100644 --- 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 index eea2cf1..1182abd 100644 --- 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 index 9661147..34fe52f 100644 --- 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 index 7ed8c3f..e6523c5 100644 --- 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 index 2fd2aaa..08575c9 100644 --- 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 index 18e2491..416b7ab 100644 --- 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 index 40a75f4..2145a50 100644 --- 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 index 2fbe260..dd5f950 100644 --- 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 index af812f8..12a401b 100644 --- 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 index 642281e..d47c867 100644 --- 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 index 5353c83..badb340 100644 --- 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 index ec8121d..b00f8ef 100644 --- 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 diff --git a/chapter15/codedeploy.yaml b/chapter15/codedeploy.yaml index 5d0290b..12fa906 100644 --- a/chapter15/codedeploy.yaml +++ b/chapter15/codedeploy.yaml @@ -216,7 +216,7 @@ Resources: ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI] Monitoring: Enabled: false - InstanceType: 't2.micro' + InstanceType: 't3.micro' NetworkInterfaces: - AssociatePublicIpAddress: true DeviceIndex: 0 @@ -280,7 +280,7 @@ Resources: Properties: AllocatedStorage: 5 BackupRetentionPeriod: 0 - DBInstanceClass: 'db.t2.micro' + DBInstanceClass: 'db.t3.micro' DBName: etherpad Engine: MySQL MasterUsername: etherpad diff --git a/chapter15/etherpad.pkr.hcl b/chapter15/etherpad.pkr.hcl index 7002f07..46cd9d7 100644 --- a/chapter15/etherpad.pkr.hcl +++ b/chapter15/etherpad.pkr.hcl @@ -12,7 +12,7 @@ source "amazon-ebs" "etherpad" { tags = { Name = "awsinaction-etherpad" } - instance_type = "t2.micro" + instance_type = "t3.micro" region = "us-east-1" source_ami_filter { filters = { diff --git a/chapter15/packer.yaml b/chapter15/packer.yaml index 65511e7..56a1519 100644 --- a/chapter15/packer.yaml +++ b/chapter15/packer.yaml @@ -173,7 +173,7 @@ Resources: ImageId: !Ref AMI Monitoring: Enabled: false - InstanceType: 't2.micro' + InstanceType: 't3.micro' NetworkInterfaces: - AssociatePublicIpAddress: true DeviceIndex: 0 @@ -243,7 +243,7 @@ Resources: Properties: AllocatedStorage: 5 BackupRetentionPeriod: 0 - DBInstanceClass: 'db.t2.micro' + DBInstanceClass: 'db.t3.micro' DBName: etherpad Engine: MySQL MasterUsername: etherpad diff --git a/chapter16/imagery.pkr.hcl b/chapter16/imagery.pkr.hcl index ce9b70e..b9b5498 100644 --- a/chapter16/imagery.pkr.hcl +++ b/chapter16/imagery.pkr.hcl @@ -12,7 +12,7 @@ source "amazon-ebs" "imagery" { tags = { Name = "awsinaction-imagery" } - instance_type = "t2.micro" + instance_type = "t3.micro" region = "us-east-1" source_ami_filter { filters = { diff --git a/chapter16/template.yaml b/chapter16/template.yaml index b0d9054..415c149 100644 --- a/chapter16/template.yaml +++ b/chapter16/template.yaml @@ -263,7 +263,7 @@ Resources: ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI] Monitoring: Enabled: false - InstanceType: 't2.micro' + InstanceType: 't3.micro' NetworkInterfaces: - AssociatePublicIpAddress: true DeviceIndex: 0 @@ -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/chapter17/url2png-loadtest.yaml b/chapter17/url2png-loadtest.yaml index 37f49ca..4ab3e58 100644 --- a/chapter17/url2png-loadtest.yaml +++ b/chapter17/url2png-loadtest.yaml @@ -190,7 +190,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: DependsOn: VPCGatewayAttachment Properties: ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI] - InstanceType: t2.micro + InstanceType: t3.micro IamInstanceProfile: !Ref IamInstanceProfile UserData: 'Fn::Base64': !Sub | diff --git a/chapter17/url2png.yaml b/chapter17/url2png.yaml index 905973b..5f74468 100644 --- a/chapter17/url2png.yaml +++ b/chapter17/url2png.yaml @@ -182,7 +182,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/chapter17/wordpress-loadtest.yaml b/chapter17/wordpress-loadtest.yaml index 8327442..be037e8 100644 --- a/chapter17/wordpress-loadtest.yaml +++ b/chapter17/wordpress-loadtest.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 @@ -434,7 +434,7 @@ Resources: - AutoScalingGroup Properties: ImageId: !FindInMap [RegionMap, !Ref 'AWS::Region', AMI] - InstanceType: 't2.micro' + InstanceType: 't3.micro' UserData: 'Fn::Base64': !Sub | #!/bin/bash -ex diff --git a/chapter17/wordpress-schedule.yaml b/chapter17/wordpress-schedule.yaml index 5d3b55e..00e7db3 100644 --- a/chapter17/wordpress-schedule.yaml +++ b/chapter17/wordpress-schedule.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/chapter17/wordpress.yaml b/chapter17/wordpress.yaml index bdbdecd..90845e6 100644 --- a/chapter17/wordpress.yaml +++ b/chapter17/wordpress.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