Merge pull request cockroachdb#104674 from srosenberg/backport23.1-10…

…3236 release-23.1: roachprod: upgrade TF and add arm64 AMIs
srosenberg · Jun 9, 2023 · c63ae6c · c63ae6c
2 parents c96115d + c7698fd
commit c63ae6c
Show file tree

Hide file tree

Showing 10 changed files with 774 additions and 732 deletions.
diff --git a/pkg/roachprod/vm/aws/aws.go b/pkg/roachprod/vm/aws/aws.go
@@ -1019,7 +1019,7 @@ func (p *Provider) runInstance(
 		return *fl
 	}
 
-	imageID := withFlagOverride(az.region.AMI, &providerOpts.ImageAMI)
+	imageID := withFlagOverride(az.region.AMI_X86_64, &providerOpts.ImageAMI)
 	if opts.EnableFIPS {
 		imageID = withFlagOverride(az.region.AMI_FIPS, &providerOpts.ImageAMI)
 	}

diff --git a/pkg/roachprod/vm/aws/config.go b/pkg/roachprod/vm/aws/config.go
@@ -67,7 +67,8 @@ type awsConfig struct {
 type awsRegion struct {
 	Name              string            `json:"region"`
 	SecurityGroup     string            `json:"security_group"`
-	AMI               string            `json:"ami_id"`
+	AMI_X86_64        string            `json:"ami_id"`
+	AMI_ARM64         string            `json:"ami_id_arm64"`
 	AMI_FIPS          string            `json:"ami_id_fips"`
 	AvailabilityZones availabilityZones `json:"subnets"`
 }