diff --git a/README.md b/README.md index d8ee489..ab02851 100644 --- a/README.md +++ b/README.md @@ -17,17 +17,17 @@ For more details see: https://github.com/GlueOps/terraform-module-cloud-aws-kube module "captain" { iam_role_to_assume = "arn:aws:iam::1234567890:role/glueops-captain-role" source = "git::https://github.com/GlueOps/terraform-module-cloud-aws-kubernetes-cluster.git" - eks_version = "1.28" + eks_version = "1.29" csi_driver_version = "v1.36.0-eksbuild.1" - coredns_version = "v1.10.1-eksbuild.13" - kube_proxy_version = "v1.28.12-eksbuild.5" + coredns_version = "v1.11.3-eksbuild.1" + kube_proxy_version = "v1.29.7-eksbuild.5" vpc_cidr_block = "10.65.0.0/26" region = "us-west-2" availability_zones = ["us-west-2a", "us-west-2b"] node_pools = [ # { -# "kubernetes_version" : "1.28", -# "ami_release_version" : "1.28.13-20241011", +# "kubernetes_version" : "1.29", +# "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.large", # "name" : "glueops-platform-node-pool-1", @@ -48,8 +48,8 @@ module "captain" { # ] # }, # { -# "kubernetes_version" : "1.28", -# "ami_release_version" : "1.28.13-20241011", +# "kubernetes_version" : "1.29", +# "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.small", # "name" : "glueops-platform-node-pool-argocd-app-controller-1", @@ -70,8 +70,8 @@ module "captain" { # ] # }, # { -# "kubernetes_version" : "1.28", -# "ami_release_version" : "1.28.13-20241011", +# "kubernetes_version" : "1.29", +# "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.medium", # "name" : "clusterwide-node-pool-1", @@ -195,11 +195,11 @@ No requirements. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [availability\_zones](#input\_availability\_zones) | The availability zones to deploy into | `list(string)` |
[
"us-west-2a",
"us-west-2b",
"us-west-2c"
]
| no | -| [coredns\_version](#input\_coredns\_version) | You should grab the appropriate version number from: https://docs.aws.amazon.com/eks/latest/userguide/managing-coredns.html | `string` | `"v1.10.1-eksbuild.11"` | no | +| [coredns\_version](#input\_coredns\_version) | You should grab the appropriate version number from: https://docs.aws.amazon.com/eks/latest/userguide/managing-coredns.html | `string` | `"v1.11.3-eksbuild.1"` | no | | [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.36.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 | -| [kube\_proxy\_version](#input\_kube\_proxy\_version) | You should grab the appropriate version number from: https://docs.aws.amazon.com/eks/latest/userguide/managing-kube-proxy.html | `string` | `"v1.28.8-eksbuild.5"` | no | +| [kube\_proxy\_version](#input\_kube\_proxy\_version) | You should grab the appropriate version number from: https://docs.aws.amazon.com/eks/latest/userguide/managing-kube-proxy.html | `string` | `"v1.29.7-eksbuild.5"` | 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/
- kubernetes\_version (string): Generally this is the same version as the EKS cluster. But if doing a node pool upgrade this may be a different version.
- ami\_release\_version (string): AMI Release version to use for EKS worker nodes. ref: https://github.com/awslabs/amazon-eks-ami/releases
- ami\_type (string): e.g. AMD64 or ARM
- 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
kubernetes_version = string
ami_release_version = string
ami_type = 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_release_version": "1.29.6-20240807",
"ami_type": "AL2_x86_64",
"disk_size_gb": 20,
"instance_type": "t3a.large",
"kubernetes_labels": {},
"kubernetes_taints": [],
"kubernetes_version": "1.29",
"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 | diff --git a/docs/.header.md b/docs/.header.md index cf44819..749eefa 100644 --- a/docs/.header.md +++ b/docs/.header.md @@ -17,17 +17,17 @@ For more details see: https://github.com/GlueOps/terraform-module-cloud-aws-kube module "captain" { iam_role_to_assume = "arn:aws:iam::1234567890:role/glueops-captain-role" source = "git::https://github.com/GlueOps/terraform-module-cloud-aws-kubernetes-cluster.git" - eks_version = "1.28" + eks_version = "1.29" csi_driver_version = "v1.36.0-eksbuild.1" - coredns_version = "v1.10.1-eksbuild.13" - kube_proxy_version = "v1.28.12-eksbuild.5" + coredns_version = "v1.11.3-eksbuild.1" + kube_proxy_version = "v1.29.7-eksbuild.5" vpc_cidr_block = "10.65.0.0/26" region = "us-west-2" availability_zones = ["us-west-2a", "us-west-2b"] node_pools = [ # { -# "kubernetes_version" : "1.28", -# "ami_release_version" : "1.28.13-20241011", +# "kubernetes_version" : "1.29", +# "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.large", # "name" : "glueops-platform-node-pool-1", @@ -48,8 +48,8 @@ module "captain" { # ] # }, # { -# "kubernetes_version" : "1.28", -# "ami_release_version" : "1.28.13-20241011", +# "kubernetes_version" : "1.29", +# "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.small", # "name" : "glueops-platform-node-pool-argocd-app-controller-1", @@ -70,8 +70,8 @@ module "captain" { # ] # }, # { -# "kubernetes_version" : "1.28", -# "ami_release_version" : "1.28.13-20241011", +# "kubernetes_version" : "1.29", +# "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.medium", # "name" : "clusterwide-node-pool-1", diff --git a/tests/main.tf b/tests/main.tf index d75106e..9ab7528 100644 --- a/tests/main.tf +++ b/tests/main.tf @@ -1,17 +1,17 @@ module "captain" { iam_role_to_assume = "arn:aws:iam::761182885829:role/glueops-captain-role" source = "../" - eks_version = "1.28" + eks_version = "1.29" csi_driver_version = "v1.36.0-eksbuild.1" - coredns_version = "v1.10.1-eksbuild.13" - kube_proxy_version = "v1.28.12-eksbuild.5" + coredns_version = "v1.11.3-eksbuild.1" + kube_proxy_version = "v1.29.7-eksbuild.5" vpc_cidr_block = "10.65.0.0/26" region = "us-west-2" availability_zones = ["us-west-2a", "us-west-2b"] node_pools = [ # { - # "kubernetes_version" : "1.28", - # "ami_release_version" : "1.28.13-20241011", + # "kubernetes_version" : "1.29", + # "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.large", # "name" : "glueops-platform-node-pool-1", @@ -32,8 +32,8 @@ module "captain" { # ] # }, # { - # "kubernetes_version" : "1.28", - # "ami_release_version" : "1.28.13-20241011", + # "kubernetes_version" : "1.29", + # "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.small", # "name" : "glueops-platform-node-pool-argocd-app-controller-1", @@ -54,8 +54,8 @@ module "captain" { # ] # }, # { - # "kubernetes_version" : "1.28", - # "ami_release_version" : "1.28.13-20241011", + # "kubernetes_version" : "1.29", + # "ami_release_version" : "1.29.8-20241024", # "ami_type" : "AL2_x86_64", # "instance_type" : "t3a.medium", # "name" : "clusterwide-node-pool-1", diff --git a/variables.tf b/variables.tf index 7e9b91c..05d62a0 100644 --- a/variables.tf +++ b/variables.tf @@ -11,13 +11,13 @@ variable "csi_driver_version" { variable "coredns_version" { type = string - default = "v1.10.1-eksbuild.11" + default = "v1.11.3-eksbuild.1" description = "You should grab the appropriate version number from: https://docs.aws.amazon.com/eks/latest/userguide/managing-coredns.html" } variable "kube_proxy_version" { type = string - default = "v1.28.8-eksbuild.5" + default = "v1.29.7-eksbuild.5" description = "You should grab the appropriate version number from: https://docs.aws.amazon.com/eks/latest/userguide/managing-kube-proxy.html" }