Updating m8i instances (#45)

* Updated policies.md

* updated postgres.yaml

* Updating m8i instances

* terraform-docs: automated action

* Fixing capacity reservation section

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: mneru002

README.md

@@ -10,10 +10,10 @@
 
 ## AWS VM module
 
-Configuration in this directory creates an AWS VM (EC2 Instance). The instance is created on an 4th generation Intel® Xeon® Scalable Processor (Sapphire Rapids) by default. 
+As of today, M8i instances are available on AWS which provide high-performance compute with the latest Intel processors and enhanced memory bandwidth. Configuration in this directory creates an AWS VM (EC2 Instance). The instance is created on an 6th generation Intel® Xeon® Scalable Processor (Granite Rapids) by default. 
 
 ## Performance Data
-
+### Below performance data is for Sapphire Rapids and Granite Rapids will be coming soon.. 
 
 <center>
 
@@ -217,7 +217,7 @@ No modules.
 | <a name="input_iam_role_tags"></a> [iam\_role\_tags](#input\_iam\_role\_tags) | A map of additional tags to add to the IAM role/profile created | `map(string)` | `{}` | no |
 | <a name="input_iam_role_use_name_prefix"></a> [iam\_role\_use\_name\_prefix](#input\_iam\_role\_use\_name\_prefix) | Determines whether the IAM role name (`iam_role_name` or `name`) is used as a prefix | `bool` | `true` | no |
 | <a name="input_instance_initiated_shutdown_behavior"></a> [instance\_initiated\_shutdown\_behavior](#input\_instance\_initiated\_shutdown\_behavior) | Shutdown behavior for the instance. Amazon defaults this to stop for EBS-backed instances and terminate for instance-store instances. Cannot be set on instance-store instance | `string` | `null` | no |
-| <a name="input_instance_type"></a> [instance\_type](#input\_instance\_type) | Instance SKU, see comments above for guidance | `string` | `"m7i.large"` | no |
+| <a name="input_instance_type"></a> [instance\_type](#input\_instance\_type) | Instance SKU, see comments above for guidance | `string` | `"m8i.large"` | no |
 | <a name="input_ipv6_address_count"></a> [ipv6\_address\_count](#input\_ipv6\_address\_count) | A number of IPv6 addresses to associate with the primary network interface. Amazon EC2 chooses the IPv6 addresses from the range of your subnet | `number` | `null` | no |
 | <a name="input_ipv6_addresses"></a> [ipv6\_addresses](#input\_ipv6\_addresses) | Specify one or more IPv6 addresses from the range of the subnet to associate with the primary network interface | `list(string)` | `null` | no |
 | <a name="input_key_name"></a> [key\_name](#input\_key\_name) | Key name of the Key Pair to use for the instance; which can be managed using the `aws_key_pair` resource | `string` | `null` | no |

examples/amazon-ec2-rhel-default-vpc/README.md

@@ -8,7 +8,7 @@
 
 ## Terraform Intel AWS VM - Red Hat RHEL VM in Default VPC
 
-This example creates an AWS Red Hat Enterprise Linux (RHEL) EC2 instance on a 4th Generation Intel® Xeon® Scalable Processor (Sapphire Rapids) in the default VPC. It is configured to create the EC2 instance in US-East-1 region. The region is provided in variables.tf in this example folder.
+This example creates an AWS Red Hat Enterprise Linux (RHEL) EC2 instance on a 6th Generation Intel® Xeon® Scalable Processor (Granite Rapids) in the default VPC. It is configured to create the EC2 instance in US-East-1 region. The region is provided in variables.tf in this example folder.
 
 This example also creates an EC2 key pair. It associates the public key with the EC2 instance. The private key is created in the local system where terraform apply is done. It also creates a new scurity group to open up the SSH port 22 to a specific IP CIDR block. This example requires RHEL SSM Parameter name for the ami_ssm_parameter in the variables file. More information can be found on [Red Hat Enterprise Linux Images Available on Amazon Web Services Documentation](<https://access.redhat.com/solutions/15356>)
 

examples/amazon-ec2-rhel-default-vpc/main.tf

@@ -1,4 +1,4 @@
-# Provision EC2 Instance on Icelake on Amazon Linux OS in default vpc. It is configured to create the EC2 in
+# Provision EC2 Instance on Granite Rapids on Amazon Linux OS in default vpc. It is configured to create the EC2 in
 # US-East-1 region. The region is provided in variables.tf in this example folder.
 
 # This example also create an EC2 key pair. Associate the public key with the EC2 instance. Create the private key
@@ -47,10 +47,11 @@ resource "aws_network_interface_sg_attachment" "sg_attachment" {
 module "ec2-vm" {
   source            = "intel/aws-vm/intel"
   key_name          = aws_key_pair.TF_key.key_name
-  ami               = "ami-0c41531b8d18cc72b"
+  #ami               = "ami-0c41531b8d18cc72b"
+  ami = "vmi-intel-base-ubuntu22-aws-spr-2025-05-23-20-24"
   tags = {
     Name     = "my-test-vm-${random_id.rid.dec}"
-    Owner    = "OwnerName-${random_id.rid.dec}",
+    Owner    = "Owner-${random_id.rid.dec}"
     Duration = "2"
   }
 }

examples/amazon-linux-ec2-capacity-reservation-default-vpc/README.md

@@ -8,9 +8,9 @@
 
 ## Terraform Intel AWS VM - Linux VM with Capacity Reservation in Default VPC
 
-This example provisions a capacity reservation in AWS availability zone us-east-1d. This capacity reservation is used for instance type m7i.large for Linux/UNIX in this availability zone. Instance eligibility for this capacity reservation will be targetted.
+This example provisions a capacity reservation in AWS availability zone us-east-1d. This capacity reservation is used for instance type m8i.large for Linux/UNIX in this availability zone. Instance eligibility for this capacity reservation will be targetted.
 
-Following the capacity reservation, it provisions an EC2 Instance on a 4th Generation Intel® Xeon® Scalable Processor (Sapphire Rapids) on Linux OS in the default vpc using the targetted capacity reservation created in the above step. It creates the EC2 instance in US-East-1 region. The region is provided in variables.tf in this example folder.
+Following the capacity reservation, it provisions an EC2 Instance on a 6th Generation Intel® Xeon® Scalable Processor (Granite Rapids) on Linux OS in the default vpc using the targetted capacity reservation created in the above step. It creates the EC2 instance in US-East-1 region. The region is provided in variables.tf in this example folder.
 
 This example also creates an EC2 key pair. It associates the public key with the EC2 instance. The private key is created in the local system where terraform apply is done. It also creates a new scurity group to open up the SSH port 22 to a specific IP CIDR block.
 
@@ -35,14 +35,15 @@ variable "region" {
 ```
 main.tf
 ```hcl
+
 # Create capacity reservation for EC2
-resource "aws_ec2_capacity_reservation" "thiscapacity" {
-  instance_type           = "m7i.large"
-  instance_platform       = "Linux/UNIX"
-  availability_zone       = "us-east-1d"
-  instance_match_criteria = "targeted"
-  instance_count          = 1
-}
+# resource "aws_ec2_capacity_reservation" "thiscapacity" {
+#   instance_type           = "m8i.large"
+#   instance_platform       = "Linux/UNIX"
+#   availability_zone       = "us-east-1d"
+#   instance_match_criteria = "targeted"
+#   instance_count          = 1
+# }
 
 resource "random_id" "rid" {
   byte_length = 5

examples/amazon-linux-ec2-capacity-reservation-default-vpc/main.tf

@@ -1,20 +1,20 @@
 # Provision a capacity reservation in AWS availability zone us-east-1d. This capacity reservation will be for
-# instance type m7i.large for Linux/UNIX in this availability zone. Instance eligibility for this capacity
+# instance type m8i.large for Linux/UNIX in this availability zone. Instance eligibility for this capacity
 # reservation will be targeted.
 
-# Provision EC2 Instance on Sapphire Rapids on Amazon Linux OS in default vpc using the targeted capacity reservation 
+# Provision EC2 Instance on Granite Rapids on Amazon Linux OS in default vpc using the targeted capacity reservation 
 # created in the above step. The EC2 is configured to create the EC2 in US-East-1 region. The region is provided
 # in variables.tf in this example folder.
 
 # This example also create an EC2 key pair. Associate the public key with the EC2 instance. Create the private key
 # in the local system where terraform apply is done. Create a new scurity group to open up the SSH port 
 # 22 to a specific IP CIDR block
 
-######### PLEASE NOTE TO CHANGE THE IP CIDR BLOCK TO ALLOW SSH FROM YOUR OWN ALLOWED IP ADDRESS FOR SSH #########
+  ######### PLEASE NOTE TO CHANGE THE IP CIDR BLOCK TO ALLOW SSH FROM YOUR OWN ALLOWED IP ADDRESS FOR SSH #########
 
 # Create capacity reservation for EC2
 resource "aws_ec2_capacity_reservation" "thiscapacity" {
-  instance_type           = "m7i.large"
+  instance_type           = "m8i.large"
   instance_platform       = "Linux/UNIX"
   availability_zone       = "us-east-1d"
   instance_match_criteria = "targeted"
@@ -36,6 +36,17 @@ resource "aws_key_pair" "TF_key" {
   public_key = tls_private_key.rsa.public_key_openssh
 }
 
+# The section below is used when leveraging reserved instance capacity that you have purchased from AWS
+# Create capacity reservation for EC2
+# resource "aws_ec2_capacity_reservation" "thiscapacity" {
+#   instance_type           = "m8i.large"
+#   instance_platform       = "Linux/UNIX"
+#   availability_zone       = "us-east-1d"
+#   instance_match_criteria = "targeted"
+#   instance_count          = 1
+# }
+
+
 resource "local_file" "TF_private_key" {
   content  = tls_private_key.rsa.private_key_pem
   filename = "tfkey.private"
@@ -47,8 +58,7 @@ resource "aws_security_group" "ssh_security_group" {
     from_port = 22
     to_port   = 22
     protocol  = "tcp"
-
-    ## CHANGE THE IP CIDR BLOCK BELOW TO ALL YOUR OWN SSH PORT ##
+    ## CHANGE THE IP CIDR BLOCK BELOW TO ALLOW SSH FROM YOUR OWN ALLOWED IP ADDRESS ##
     cidr_blocks = ["a.b.c.d/x"]
   }
 }
@@ -66,9 +76,10 @@ module "ec2-vm" {
       capacity_reservation_id = aws_ec2_capacity_reservation.thiscapacity.id
     }
   }
+  
   tags = {
     Name     = "my-test-vm-${random_id.rid.dec}"
-    Owner    = "OwnerName-${random_id.rid.dec}",
+    Owner    = "OwnerName-${random_id.rid.dec}"
     Duration = "2"
   }
 }

examples/amazon-linux-ec2-default-vpc-ico-by-densify/densify_recommendations.auto.tfvars

@@ -2,7 +2,7 @@ densify_recommendations = {
 
   "mobile-app-user2" = {
     currentType = "m4.xlarge"
-    recommendedType = "m6i.xlarge"
+    recommendedType = "m8i.xlarge"
     approvalType = "all"
     predictedUptime = "80.61"
     recommendationType = "Modernize"

examples/amazon-linux-ec2-default-vpc-ico-by-densify/main.tf

@@ -1,4 +1,4 @@
-# Provision EC2 Instance on Icelake on Amazon Linux OS in default vpc. It is configured to create the EC2 in
+# Provision EC2 Instance on Granite Rapids on Amazon Linux OS in default vpc. It is configured to create the EC2 in
 # US-East-1 region. The region is provided in variables.tf in this example folder.
 
 # This example also create an EC2 key pair. Associate the public key with the EC2 instance. Create the private key

examples/amazon-linux-ec2-default-vpc-ico-by-densify/variables.tf

@@ -16,7 +16,7 @@ variable "name" {
 variable "densify_fallback" {
   type = map(string)
   default = {
-    recommendedType          = "m6i.large"
+    recommendedType          = "m8i.large"
     currentType              = "m5.2xlarge"
     approvalType             = "all"
     savingsEstimate          = "0"

examples/amazon-linux-ec2-default-vpc/README.md

@@ -8,7 +8,7 @@
 
 ## Terraform Intel AWS VM - Linux VM in Default VPC
 
-This example creates an AWS EC2 instance on 4th Generation Intel® Xeon® Scalable Processor (Sapphire Rapids) on Linux Operating System in the default VPC. It is configured to create the EC2 instance in US-East-1 region. The region is provided in variables.tf in this example folder.
+This example creates an AWS EC2 instance on 6th Generation Intel® Xeon® Scalable Processor (Granite Rapids) on Linux Operating System in the default VPC. It is configured to create the EC2 instance in US-East-1 region. The region is provided in variables.tf in this example folder.
 
 This example also creates an EC2 key pair. It associates the public key with the EC2 instance. The private key is created in the local system where terraform apply is done. It also creates a new scurity group to open up the SSH port 22 to a specific IP CIDR block.
 

examples/amazon-linux-ec2-default-vpc/main.tf

@@ -1,4 +1,4 @@
-# Provision EC2 Instance on Icelake on Amazon Linux OS in default vpc. It is configured to create the EC2 in
+# Provision EC2 Instance on Granite Rapids on Amazon Linux OS in default vpc. It is configured to create the EC2 in
 # US-East-1 region. The region is provided in variables.tf in this example folder.
 
 # This example also create an EC2 key pair. Associate the public key with the EC2 instance. Create the private key