From 85788fe740ddd79f7f839d8bc72a3c96b485e15a Mon Sep 17 00:00:00 2001 From: Dakota Long Date: Wed, 1 Nov 2023 18:08:22 -0400 Subject: [PATCH] (OSD-19488) (#201) * (OSD-19488) Update the root volume used by Network Verifier to "/dev/sda1" from "/dev/xvda" * (OSD-19488) Update AMIs for new root volume changes. --------- Co-authored-by: Dakota Long --- pkg/verifier/aws/aws_verifier.go | 57 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/pkg/verifier/aws/aws_verifier.go b/pkg/verifier/aws/aws_verifier.go index e8b20c25..c9decb5f 100644 --- a/pkg/verifier/aws/aws_verifier.go +++ b/pkg/verifier/aws/aws_verifier.go @@ -21,33 +21,33 @@ import ( var ( defaultAmi = map[string]string{ - "af-south-1": "ami-0496b860bd457437f", - "ap-east-1": "ami-0a4acc6e2240c28c0", - "ap-northeast-1": "ami-0c803c5048783502d", - "ap-northeast-2": "ami-097bfe6c51df21ff2", - "ap-northeast-3": "ami-0f9fd8814f605fced", - "ap-south-1": "ami-0680fbc5b2a9a8a27", - "ap-south-2": "ami-0b17f7be910efe584", - "ap-southeast-1": "ami-03a9fb3956e5eaa85", - "ap-southeast-2": "ami-0d1cfea2e07d4a8ba", - "ap-southeast-3": "ami-03b618de9a400b62e", - "ap-southeast-4": "ami-091b4c35a00bf0c0c", - "ca-central-1": "ami-03f4c87d571a1d38c", - "eu-central-1": "ami-04210135cdf44ea1c", - "eu-central-2": "ami-0c9cd51945a26d2d7", - "eu-north-1": "ami-05de3c8fc38d53b0e", - "eu-south-1": "ami-02f3c2b3f95ec5471", - "eu-south-2": "ami-0d1dda6711743ddd4", - "eu-west-1": "ami-04faa6d68d9fda4dd", - "eu-west-2": "ami-01c4c11d06660214c", - "eu-west-3": "ami-0ab155e4e470cf8ba", - "me-central-1": "ami-071ca4418c87c0a0f", - "me-south-1": "ami-0194a03c002b56920", - "sa-east-1": "ami-08c2432c9373602a5", - "us-east-1": "ami-00cd2c6d77d317c06", - "us-east-2": "ami-01187490fcef7e973", - "us-west-1": "ami-08013983a3c8324c9", - "us-west-2": "ami-033cd6d1c118adec6", + "af-south-1": "ami-0e7e90f5a8557b8d6", + "ap-east-1": "ami-05ee050a367ee5706", + "ap-northeast-1": "ami-06dbf6a7ef9bdf2c8", + "ap-northeast-2": "ami-0ac7bd07966247f41", + "ap-northeast-3": "ami-0968392f31285f459", + "ap-south-1": "ami-0267d03e3be0b4b30", + "ap-south-2": "ami-065289e536d1deb01", + "ap-southeast-1": "ami-0e0969b268859d182", + "ap-southeast-2": "ami-0d60430c78bce7d3c", + "ap-southeast-3": "ami-021732d200600f0b6", + "ap-southeast-4": "ami-02104deba0d784ce4", + "ca-central-1": "ami-0b2112eb85d66f9cc", + "eu-central-1": "ami-0f986a55e68070796", + "eu-central-2": "ami-01dc09a6de621911a", + "eu-north-1": "ami-0885df175cdf6787c", + "eu-south-1": "ami-0490bacb9a4ae3a48", + "eu-south-2": "ami-094214242f055b327", + "eu-west-1": "ami-0342c86a5bf8d4623", + "eu-west-2": "ami-0d5e499ba9bd84270", + "eu-west-3": "ami-058c17d5e11588a34", + "me-central-1": "ami-01cb10ec79305596a", + "me-south-1": "ami-02d9162d2610a38e6", + "sa-east-1": "ami-0a7afe4c752036137", + "us-east-1": "ami-0b7a0afd02d5752da", + "us-east-2": "ami-001936a8fdfd4fe17", + "us-west-1": "ami-06ec2bc7e3a8e5c77", + "us-west-2": "ami-0ad0474764ad2b0fb", } ) @@ -148,6 +148,7 @@ type createEC2InstanceInput struct { func (a *AwsVerifier) createEC2Instance(input createEC2InstanceInput) (string, error) { ebsBlockDevice := &ec2Types.EbsBlockDevice{ + VolumeSize: awsTools.Int32(10), DeleteOnTermination: awsTools.Bool(true), Encrypted: awsTools.Bool(true), } @@ -180,7 +181,7 @@ func (a *AwsVerifier) createEC2Instance(input createEC2InstanceInput) (string, e // We specify block devices mainly to enable EBS encryption BlockDeviceMappings: []ec2Types.BlockDeviceMapping{ { - DeviceName: awsTools.String("/dev/xvda"), + DeviceName: awsTools.String("/dev/sda1"), Ebs: ebsBlockDevice, }, },