Skip to content

Commit

Permalink
feat: updates (#184)
Browse files Browse the repository at this point in the history
  • Loading branch information
@venkatamutyala
venkatamutyala authored Nov 19, 2024
1 parent 7fa6f11 commit 087f04a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
20 changes: 10 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ 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.29"
csi_driver_version = "v1.36.0-eksbuild.1"
coredns_version = "v1.11.3-eksbuild.1"
kube_proxy_version = "v1.29.7-eksbuild.5"
csi_driver_version = "v1.37.0-eksbuild.1"
coredns_version = "v1.11.3-eksbuild.2"
kube_proxy_version = "v1.29.10-eksbuild.2"
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.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.large",
# "name" : "glueops-platform-node-pool-1",
Expand All @@ -49,7 +49,7 @@ module "captain" {
# },
# {
# "kubernetes_version" : "1.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.small",
# "name" : "glueops-platform-node-pool-argocd-app-controller-1",
Expand All @@ -71,7 +71,7 @@ module "captain" {
# },
# {
# "kubernetes_version" : "1.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.medium",
# "name" : "clusterwide-node-pool-1",
Expand Down Expand Up @@ -195,12 +195,12 @@ No requirements.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_availability_zones"></a> [availability\_zones](#input\_availability\_zones) | The availability zones to deploy into | `list(string)` | <pre>[<br/> "us-west-2a",<br/> "us-west-2b",<br/> "us-west-2c"<br/>]</pre> | no |
| <a name="input_coredns_version"></a> [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 |
| <a name="input_csi_driver_version"></a> [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 |
| <a name="input_coredns_version"></a> [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.2"` | no |
| <a name="input_csi_driver_version"></a> [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.37.0-eksbuild.1"` | no |
| <a name="input_eks_version"></a> [eks\_version](#input\_eks\_version) | The version of EKS to deploy | `string` | `"1.27"` | no |
| <a name="input_iam_role_to_assume"></a> [iam\_role\_to\_assume](#input\_iam\_role\_to\_assume) | The full ARN of the IAM role to assume | `string` | n/a | yes |
| <a name="input_kube_proxy_version"></a> [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 |
| <a name="input_node_pools"></a> [node\_pools](#input\_node\_pools) | node pool configurations:<br/> - name (string): Name of the node pool. MUST BE UNIQUE! Recommended to use YYYYMMDD in the name<br/> - node\_count (number): number of nodes to create in the node pool.<br/> - instance\_type (string): Instance type to use for the nodes. ref: https://instances.vantage.sh/<br/> - 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.<br/> - ami\_release\_version (string): AMI Release version to use for EKS worker nodes. ref: https://github.com/awslabs/amazon-eks-ami/releases<br/> - ami\_type (string): e.g. AMD64 or ARM<br/> - spot (bool): Enable spot instances for the nodes. DO NOT ENABLE IN PROD!<br/> - disk\_size\_gb (number): Disk size in GB for the nodes.<br/> - max\_pods (number): max pods that can be scheduled per node.<br/> - 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:<br/> - kubernetes\_labels (map(string)): Map of labels to apply to the nodes. ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/<br/> - kubernetes\_taints (list(object)): List of taints to apply to the nodes. ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ | <pre>list(object({<br/> name = string<br/> node_count = number<br/> instance_type = string<br/> kubernetes_version = string<br/> ami_release_version = string<br/> ami_type = string<br/> spot = bool<br/> disk_size_gb = number<br/> max_pods = number<br/> ssh_key_pair_names = list(string)<br/> kubernetes_labels = map(string)<br/> kubernetes_taints = list(object({<br/> key = string<br/> value = string<br/> effect = string<br/> }))<br/><br/> }))</pre> | <pre>[<br/> {<br/> "ami_release_version": "1.29.6-20240807",<br/> "ami_type": "AL2_x86_64",<br/> "disk_size_gb": 20,<br/> "instance_type": "t3a.large",<br/> "kubernetes_labels": {},<br/> "kubernetes_taints": [],<br/> "kubernetes_version": "1.29",<br/> "max_pods": 110,<br/> "name": "default-pool",<br/> "node_count": 1,<br/> "spot": false,<br/> "ssh_key_pair_names": []<br/> }<br/>]</pre> | no |
| <a name="input_kube_proxy_version"></a> [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.10-eksbuild.2"` | no |
| <a name="input_node_pools"></a> [node\_pools](#input\_node\_pools) | node pool configurations:<br/> - name (string): Name of the node pool. MUST BE UNIQUE! Recommended to use YYYYMMDD in the name<br/> - node\_count (number): number of nodes to create in the node pool.<br/> - instance\_type (string): Instance type to use for the nodes. ref: https://instances.vantage.sh/<br/> - 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.<br/> - ami\_release\_version (string): AMI Release version to use for EKS worker nodes. ref: https://github.com/awslabs/amazon-eks-ami/releases<br/> - ami\_type (string): e.g. AMD64 or ARM<br/> - spot (bool): Enable spot instances for the nodes. DO NOT ENABLE IN PROD!<br/> - disk\_size\_gb (number): Disk size in GB for the nodes.<br/> - max\_pods (number): max pods that can be scheduled per node.<br/> - 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:<br/> - kubernetes\_labels (map(string)): Map of labels to apply to the nodes. ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/<br/> - kubernetes\_taints (list(object)): List of taints to apply to the nodes. ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ | <pre>list(object({<br/> name = string<br/> node_count = number<br/> instance_type = string<br/> kubernetes_version = string<br/> ami_release_version = string<br/> ami_type = string<br/> spot = bool<br/> disk_size_gb = number<br/> max_pods = number<br/> ssh_key_pair_names = list(string)<br/> kubernetes_labels = map(string)<br/> kubernetes_taints = list(object({<br/> key = string<br/> value = string<br/> effect = string<br/> }))<br/><br/> }))</pre> | <pre>[<br/> {<br/> "ami_release_version": "1.29.8-20241109",<br/> "ami_type": "AL2_x86_64",<br/> "disk_size_gb": 20,<br/> "instance_type": "t3a.large",<br/> "kubernetes_labels": {},<br/> "kubernetes_taints": [],<br/> "kubernetes_version": "1.29",<br/> "max_pods": 110,<br/> "name": "default-pool",<br/> "node_count": 1,<br/> "spot": false,<br/> "ssh_key_pair_names": []<br/> }<br/>]</pre> | no |
| <a name="input_peering_configs"></a> [peering\_configs](#input\_peering\_configs) | A list of maps containing VPC peering configuration details | <pre>list(object({<br/> vpc_peering_connection_id = string<br/> destination_cidr_block = string<br/> }))</pre> | `[]` | no |
| <a name="input_region"></a> [region](#input\_region) | The AWS region to deploy into | `string` | n/a | yes |
| <a name="input_vpc_cidr_block"></a> [vpc\_cidr\_block](#input\_vpc\_cidr\_block) | The CIDR block for the VPC | `string` | `"10.65.0.0/26"` | no |
Expand Down
12 changes: 6 additions & 6 deletions docs/.header.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ 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.29"
csi_driver_version = "v1.36.0-eksbuild.1"
coredns_version = "v1.11.3-eksbuild.1"
kube_proxy_version = "v1.29.7-eksbuild.5"
csi_driver_version = "v1.37.0-eksbuild.1"
coredns_version = "v1.11.3-eksbuild.2"
kube_proxy_version = "v1.29.10-eksbuild.2"
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.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.large",
# "name" : "glueops-platform-node-pool-1",
Expand All @@ -49,7 +49,7 @@ module "captain" {
# },
# {
# "kubernetes_version" : "1.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.small",
# "name" : "glueops-platform-node-pool-argocd-app-controller-1",
Expand All @@ -71,7 +71,7 @@ module "captain" {
# },
# {
# "kubernetes_version" : "1.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.medium",
# "name" : "clusterwide-node-pool-1",
Expand Down
12 changes: 6 additions & 6 deletions tests/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ module "captain" {
iam_role_to_assume = "arn:aws:iam::761182885829:role/glueops-captain-role"
source = "../"
eks_version = "1.29"
csi_driver_version = "v1.36.0-eksbuild.1"
coredns_version = "v1.11.3-eksbuild.1"
kube_proxy_version = "v1.29.7-eksbuild.5"
csi_driver_version = "v1.37.0-eksbuild.1"
coredns_version = "v1.11.3-eksbuild.2"
kube_proxy_version = "v1.29.10-eksbuild.2"
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.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.large",
# "name" : "glueops-platform-node-pool-1",
Expand All @@ -33,7 +33,7 @@ module "captain" {
# },
# {
# "kubernetes_version" : "1.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.small",
# "name" : "glueops-platform-node-pool-argocd-app-controller-1",
Expand All @@ -55,7 +55,7 @@ module "captain" {
# },
# {
# "kubernetes_version" : "1.29",
# "ami_release_version" : "1.29.8-20241024",
# "ami_release_version" : "1.29.8-20241109",
# "ami_type" : "AL2_x86_64",
# "instance_type" : "t3a.medium",
# "name" : "clusterwide-node-pool-1",
Expand Down
8 changes: 4 additions & 4 deletions variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ variable "region" {

variable "csi_driver_version" {
type = string
default = "v1.36.0-eksbuild.1"
default = "v1.37.0-eksbuild.1"
description = "You should grab the appropriate version number from: https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG.md"
}

variable "coredns_version" {
type = string
default = "v1.11.3-eksbuild.1"
default = "v1.11.3-eksbuild.2"
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.29.7-eksbuild.5"
default = "v1.29.10-eksbuild.2"
description = "You should grab the appropriate version number from: https://docs.aws.amazon.com/eks/latest/userguide/managing-kube-proxy.html"
}

Expand Down Expand Up @@ -92,7 +92,7 @@ variable "node_pools" {
name = "default-pool"
node_count = 1
instance_type = "t3a.large"
ami_release_version = "1.29.6-20240807"
ami_release_version = "1.29.8-20241109"
kubernetes_version = "1.29"
ami_type = "AL2_x86_64"
spot = false
Expand Down

0 comments on commit 087f04a

Please sign in to comment.