Merge remote-tracking branch 'origin/main' into add-eks-v130-support

ios-xr · Jun 4, 2024 · 007c945 · 007c945
2 parents 7e60133 + b59215b
commit 007c945
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/modules/aws/bootstrap/main.tf b/modules/aws/bootstrap/main.tf
@@ -64,10 +64,11 @@ resource "null_resource" "kubeconfig" {
 module "bastion" {
   source = "../../../modules/aws/bastion"
 
-  instance_type = "t3.nano"
-  key_name      = module.key_pair.key_name
-  name          = "${local.name_prefix}-bastion"
-  subnet_id     = module.vpc.public_subnet_ids[0]
+  instance_type      = "t3.nano"
+  key_name           = module.key_pair.key_name
+  name               = "${local.name_prefix}-bastion"
+  remote_access_cidr = var.bastion_remote_access_cidr_blocks
+  subnet_id          = module.vpc.public_subnet_ids[0]
 }
 
 resource "aws_iam_role" "node" {

diff --git a/modules/aws/bootstrap/variables.tf b/modules/aws/bootstrap/variables.tf
@@ -8,6 +8,12 @@ variable "azs" {
   nullable    = false
 }
 
+variable "bastion_remote_access_cidr_blocks" {
+  description = "Allowed CIDR blocks for external SSH access to the Bastion instance"
+  type        = list(string)
+  default     = null
+}
+
 variable "cluster_version" {
   description = "Cluster version"
   type        = string

diff --git a/modules/aws/node-props/main.tf b/modules/aws/node-props/main.tf
@@ -3,12 +3,12 @@ locals {
     "cloud-router" = {
       "m5.2xlarge" = {
         cpuset       = "2-3"
-        hugepages_gb = 4
+        hugepages_gb = 6
       }
 
       "m5n.2xlarge" = {
         cpuset       = "2-3"
-        hugepages_gb = 4
+        hugepages_gb = 6
       }
 
       "m5.24xlarge" = {
@@ -35,6 +35,27 @@ locals {
       "m5n.16xlarge",
       "m5n.24xlarge",
     ]
+
+    m5zn = [
+      "m5zn.12xlarge",
+    ]
+
+    m6in = [
+      # m6in.16xlarge is confirmed single NUMA (different from m5n family)
+      "m6in.24xlarge",
+      "m6in.32xlarge",
+    ]
+
+    m6a = [
+      # m6a.24xlarge" confirmed as single NUMA
+      "m6a.32xlarge",
+      "m6a.48xlarge",
+    ]
+
+    m7i = [
+      # m7i.24xlarge confirmed as single NUMA
+      "m7i.48xlarge",
+    ]
   }
 }
 

diff --git a/tests/ut/test_node.py b/tests/ut/test_node.py
@@ -243,7 +243,7 @@ def test_unknown_instance_type(ec2, tf: Terraform, base_vars: dict[str, Any]):
     unknown instance type.
 
     """
-    vars = base_vars | {"instance_type": "m7i.48xlarge", "is_xrd_ami": True}
+    vars = base_vars | {"instance_type": "m1.small", "is_xrd_ami": True}
     with pytest.raises(subprocess.CalledProcessError) as excinfo:
         tf.apply(vars=vars)
         assert "Isolated cores was not provided" in str(excinfo.value)