From 1a9539d9e9e3572d505c2ba70e9f6dc65eb34224 Mon Sep 17 00:00:00 2001 From: Venkata Mutyala Date: Thu, 2 Nov 2023 14:38:29 -0700 Subject: [PATCH] feat: update EKS AMI (#64) --- README.md | 6 +++--- docs/.header.md | 4 ++-- tests/main.tf | 4 ++-- variables.tf | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c5adaea..cf86c76 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ module "captain" { availability_zones = ["us-west-2a", "us-west-2b"] node_pools = [ # { -# "ami_image_id" : "ami-084cf519d356bb718", +# "ami_image_id" : "ami-0b9177c9139f911c2", # "instance_type" : "t3a.xlarge", # "name" : "glueops-platform-node-pool-1", # "node_count" : 4, @@ -44,7 +44,7 @@ module "captain" { # ] # }, # { -# "ami_image_id" : "ami-084cf519d356bb718", +# "ami_image_id" : "ami-0b9177c9139f911c2", # "instance_type" : "t3a.large", # "name" : "clusterwide-node-pool-1", # "node_count" : 4, @@ -171,7 +171,7 @@ No requirements. | [csi\_driver\_version](#input\_csi\_driver\_version) | You should grab the appropriate version number from: https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG.md | `string` | `"v1.24.0-eksbuild.1"` | no | | [eks\_version](#input\_eks\_version) | The version of EKS to deploy | `string` | `"1.27"` | no | | [iam\_role\_to\_assume](#input\_iam\_role\_to\_assume) | The full ARN of the IAM role to assume | `string` | n/a | yes | -| [node\_pools](#input\_node\_pools) | node pool configurations:
- name (string): Name of the node pool. MUST BE UNIQUE! Recommended to use YYYYMMDD in the name
- node\_count (number): number of nodes to create in the node pool.
- instance\_type (string): Instance type to use for the nodes. ref: https://instances.vantage.sh/
- ami\_image\_id (string): AMI image ID to use for EKS worker nodes. This varies per region!! ref: https://github.com/awslabs/amazon-eks-ami/releases to find the AMI ID go to the console: https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#Images:visibility=public-images;search=amazon-eks-node-1.27-v20230703
- spot (bool): Enable spot instances for the nodes. DO NOT ENABLE IN PROD!
- disk\_size\_gb (number): Disk size in GB for the nodes.
- max\_pods (number): max pods that can be scheduled per node.
- ssh\_key\_pair\_names (list(string)): List of SSH key pair names to associate with the nodes. ref: https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#KeyPairs:
- kubernetes\_labels (map(string)): Map of labels to apply to the nodes. ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
- kubernetes\_taints (list(object)): List of taints to apply to the nodes. ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ | 
list(object({
    name               = string
    node_count         = number
    instance_type      = string
    ami_image_id       = string
    spot               = bool
    disk_size_gb       = number
    max_pods           = number
    ssh_key_pair_names = list(string)
    kubernetes_labels  = map(string)
    kubernetes_taints = list(object({
      key    = string
      value  = string
      effect = string
    }))

  }))
| 
[
  {
    "ami_image_id": "ami-084cf519d356bb718",
    "disk_size_gb": 20,
    "instance_type": "t3a.large",
    "kubernetes_labels": {},
    "kubernetes_taints": [],
    "max_pods": 110,
    "name": "default-pool",
    "node_count": 1,
    "spot": false,
    "ssh_key_pair_names": []
  }
]
| no | +| [node\_pools](#input\_node\_pools) | node pool configurations:
- name (string): Name of the node pool. MUST BE UNIQUE! Recommended to use YYYYMMDD in the name
- node\_count (number): number of nodes to create in the node pool.
- instance\_type (string): Instance type to use for the nodes. ref: https://instances.vantage.sh/
- ami\_image\_id (string): AMI image ID to use for EKS worker nodes. This varies per region!! ref: https://github.com/awslabs/amazon-eks-ami/releases to find the AMI ID go to the console: https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#Images:visibility=public-images;search=amazon-eks-node-1.27-v20230703
- spot (bool): Enable spot instances for the nodes. DO NOT ENABLE IN PROD!
- disk\_size\_gb (number): Disk size in GB for the nodes.
- max\_pods (number): max pods that can be scheduled per node.
- ssh\_key\_pair\_names (list(string)): List of SSH key pair names to associate with the nodes. ref: https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#KeyPairs:
- kubernetes\_labels (map(string)): Map of labels to apply to the nodes. ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
- kubernetes\_taints (list(object)): List of taints to apply to the nodes. ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ | 
list(object({
    name               = string
    node_count         = number
    instance_type      = string
    ami_image_id       = string
    spot               = bool
    disk_size_gb       = number
    max_pods           = number
    ssh_key_pair_names = list(string)
    kubernetes_labels  = map(string)
    kubernetes_taints = list(object({
      key    = string
      value  = string
      effect = string
    }))

  }))
| 
[
  {
    "ami_image_id": "ami-0b9177c9139f911c2",
    "disk_size_gb": 20,
    "instance_type": "t3a.large",
    "kubernetes_labels": {},
    "kubernetes_taints": [],
    "max_pods": 110,
    "name": "default-pool",
    "node_count": 1,
    "spot": false,
    "ssh_key_pair_names": []
  }
]
| no | | [peering\_configs](#input\_peering\_configs) | A list of maps containing VPC peering configuration details | 
list(object({
    vpc_peering_connection_id = string
    destination_cidr_block    = string
  }))
| `[]` | no | | [region](#input\_region) | The AWS region to deploy into | `string` | n/a | yes | | [vpc\_cidr\_block](#input\_vpc\_cidr\_block) | The CIDR block for the VPC | `string` | `"10.65.0.0/26"` | no | diff --git a/docs/.header.md b/docs/.header.md index d2b21af..cd1480d 100644 --- a/docs/.header.md +++ b/docs/.header.md @@ -23,7 +23,7 @@ module "captain" { availability_zones = ["us-west-2a", "us-west-2b"] node_pools = [ # { -# "ami_image_id" : "ami-084cf519d356bb718", +# "ami_image_id" : "ami-0b9177c9139f911c2", # "instance_type" : "t3a.xlarge", # "name" : "glueops-platform-node-pool-1", # "node_count" : 4, @@ -43,7 +43,7 @@ module "captain" { # ] # }, # { -# "ami_image_id" : "ami-084cf519d356bb718", +# "ami_image_id" : "ami-0b9177c9139f911c2", # "instance_type" : "t3a.large", # "name" : "clusterwide-node-pool-1", # "node_count" : 4, diff --git a/tests/main.tf b/tests/main.tf index 1780b3e..5b45373 100644 --- a/tests/main.tf +++ b/tests/main.tf @@ -8,7 +8,7 @@ module "captain" { availability_zones = ["us-west-2a", "us-west-2b"] node_pools = [ # { -# "ami_image_id" : "ami-084cf519d356bb718", +# "ami_image_id" : "ami-0b9177c9139f911c2", # "instance_type" : "t3a.small", # "name" : "glueops-platform-node-pool-1", # "node_count" : 2, @@ -28,7 +28,7 @@ module "captain" { # ] # }, # { -# "ami_image_id" : "ami-084cf519d356bb718", +# "ami_image_id" : "ami-0b9177c9139f911c2", # "instance_type" : "t3a.small", # "name" : "clusterwide-node-pool-1", # "node_count" : 2, diff --git a/variables.tf b/variables.tf index a5db0f0..7e12441 100644 --- a/variables.tf +++ b/variables.tf @@ -84,7 +84,7 @@ variable "node_pools" { name = "default-pool" node_count = 1 instance_type = "t3a.large" - ami_image_id = "ami-084cf519d356bb718" + ami_image_id = "ami-0b9177c9139f911c2" spot = false disk_size_gb = 20 max_pods = 110