Skip to content

Commit

Permalink
feat: update ami + csi + coredns + codespace (#82)
Browse files Browse the repository at this point in the history
* feat: update ami + csi + coredns + codespace + create provider_versions.tf
* terraform-docs: automated action
---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
venkatamutyala and github-actions[bot] authored Jan 15, 2024
1 parent bb95326 commit 96fa701
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/aws-cloud-regression-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Codespace Container
run: |
echo "::group::Setup Codespace Container"
docker run -d -v $(pwd):/app --workdir /app/tests --rm --name codespaces ghcr.io/glueops/codespaces:v0.31.4 sleep infinity
docker run -d -v $(pwd):/app --workdir /app/tests --rm --name codespaces ghcr.io/glueops/codespaces:v0.33.1 sleep infinity
echo "::endgroup::"
- name: Running AWS Regression Suite
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}

Expand All @@ -16,4 +16,4 @@ jobs:
working-dir: .
output-file: README.md
output-method: inject
git-push: "true"
git-push: "true"
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ 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.27"
csi_driver_version = "v1.26.0-eksbuild.1"
csi_driver_version = "v1.26.1-eksbuild.1"
coredns_version = "v1.10.1-eksbuild.6"
vpc_cidr_block = "10.65.0.0/26"
region = "us-west-2"
availability_zones = ["us-west-2a", "us-west-2b"]
node_pools = [
# {
# "ami_image_id" : "ami-02a1c9c2cf0dd5307",
# "ami_image_id" : "ami-0e4d1fcaab365a4dd",
# "instance_type" : "t3a.xlarge",
# "name" : "glueops-platform-node-pool-1",
# "node_count" : 4,
Expand All @@ -44,7 +45,7 @@ module "captain" {
# ]
# },
# {
# "ami_image_id" : "ami-02a1c9c2cf0dd5307",
# "ami_image_id" : "ami-0e4d1fcaab365a4dd",
# "instance_type" : "t3a.large",
# "name" : "clusterwide-node-pool-1",
# "node_count" : 4,
Expand Down Expand Up @@ -167,11 +168,11 @@ 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.10.1-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.26.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.10.1-eksbuild.6"` | 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.26.1-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_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> - 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<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> ami_image_id = 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_image_id": "ami-02a1c9c2cf0dd5307",<br> "disk_size_gb": 20,<br> "instance_type": "t3a.large",<br> "kubernetes_labels": {},<br> "kubernetes_taints": [],<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_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> - 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<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> ami_image_id = 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_image_id": "ami-0e4d1fcaab365a4dd",<br> "disk_size_gb": 20,<br> "instance_type": "t3a.large",<br> "kubernetes_labels": {},<br> "kubernetes_taints": [],<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
7 changes: 4 additions & 3 deletions docs/.header.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ 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.27"
csi_driver_version = "v1.26.0-eksbuild.1"
csi_driver_version = "v1.26.1-eksbuild.1"
coredns_version = "v1.10.1-eksbuild.6"
vpc_cidr_block = "10.65.0.0/26"
region = "us-west-2"
availability_zones = ["us-west-2a", "us-west-2b"]
node_pools = [
# {
# "ami_image_id" : "ami-02a1c9c2cf0dd5307",
# "ami_image_id" : "ami-0e4d1fcaab365a4dd",
# "instance_type" : "t3a.xlarge",
# "name" : "glueops-platform-node-pool-1",
# "node_count" : 4,
Expand All @@ -43,7 +44,7 @@ module "captain" {
# ]
# },
# {
# "ami_image_id" : "ami-02a1c9c2cf0dd5307",
# "ami_image_id" : "ami-0e4d1fcaab365a4dd",
# "instance_type" : "t3a.large",
# "name" : "clusterwide-node-pool-1",
# "node_count" : 4,
Expand Down
7 changes: 4 additions & 3 deletions tests/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ module "captain" {
iam_role_to_assume = "arn:aws:iam::761182885829:role/glueops-captain-role"
source = "../"
eks_version = "1.27"
csi_driver_version = "v1.26.0-eksbuild.1"
csi_driver_version = "v1.26.1-eksbuild.1"
coredns_version = "v1.10.1-eksbuild.6"
vpc_cidr_block = "10.65.0.0/26"
region = "us-west-2"
availability_zones = ["us-west-2a", "us-west-2b"]
node_pools = [
# {
# "ami_image_id" : "ami-02a1c9c2cf0dd5307",
# "ami_image_id" : "ami-0e4d1fcaab365a4dd",
# "instance_type" : "t3a.xlarge",
# "name" : "glueops-platform-node-pool-1",
# "node_count" : 4,
Expand All @@ -28,7 +29,7 @@ module "captain" {
# ]
# },
# {
# "ami_image_id" : "ami-02a1c9c2cf0dd5307",
# "ami_image_id" : "ami-0e4d1fcaab365a4dd",
# "instance_type" : "t3a.large",
# "name" : "clusterwide-node-pool-1",
# "node_count" : 4,
Expand Down
3 changes: 3 additions & 0 deletions tests/provider_versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module "provider_versions" {
source = "git::https://github.com/GlueOps/terraform-module-provider-versions.git"
}
6 changes: 3 additions & 3 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ variable "region" {

variable "csi_driver_version" {
type = string
default = "v1.26.0-eksbuild.1"
default = "v1.26.1-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.10.1-eksbuild.2"
default = "v1.10.1-eksbuild.6"
description = "You should grab the appropriate version number from: https://docs.aws.amazon.com/eks/latest/userguide/managing-coredns.html"
}

Expand Down Expand Up @@ -84,7 +84,7 @@ variable "node_pools" {
name = "default-pool"
node_count = 1
instance_type = "t3a.large"
ami_image_id = "ami-02a1c9c2cf0dd5307"
ami_image_id = "ami-0e4d1fcaab365a4dd"
spot = false
disk_size_gb = 20
max_pods = 110
Expand Down

0 comments on commit 96fa701

Please sign in to comment.