diff --git a/.github/workflows/terraform-validate.yaml b/.github/workflows/terraform-validate.yaml index ac349eb..fd397c8 100644 --- a/.github/workflows/terraform-validate.yaml +++ b/.github/workflows/terraform-validate.yaml @@ -21,6 +21,10 @@ jobs: - name: Validate Terraform Configuration id: validate uses: CSVD/terraform-validate@main + with: + github_app_pem_file: ${{ secrets.GH_APP_PEM_FILE }} + github_app_installation_id: ${{ vars.GH_APP_INSTALLATION_ID }} + github_app_id: ${{ vars.GH_APP_ID }} - name: Check Validation/Test Results if: always() diff --git a/README.md b/README.md index 9200152..e714cd8 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ efs-csi-controller 0 5m | Name | Source | Version | |------|--------|---------| | [cloudwatch\_observability\_irsa\_role](#module\_cloudwatch\_observability\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks | n/a | -| [cluster](#module\_cluster) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks/ | v21.15.1 | +| [cluster](#module\_cluster) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks/ | v21.23.0 | | [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks | n/a | | [efs\_csi\_irsa\_role](#module\_efs\_csi\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks | n/a | | [tags](#module\_tags) | git@github.e.it.census.gov:terraform-modules/boc-nts//tags | n/a | @@ -151,6 +151,7 @@ efs-csi-controller 0 5m | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [access\_entries](#input\_access\_entries) | Map of access entries to add to the cluster | `any` | `{}` | no | +| [ami\_type](#input\_ami\_type) | AMI type to use for the EKS node group | `string` | `""` | no | | [census\_private\_cidr](#input\_census\_private\_cidr) | Census Private CIR Blocks | `list(string)` |
[| no | | [cloudwatch\_retention\_days](#input\_cloudwatch\_retention\_days) | number of days to retain logs in cloudwatch | `string` | `"14"` | no | | [cluster\_name](#input\_cluster\_name) | EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev) | `string` | n/a | yes | @@ -170,6 +171,7 @@ efs-csi-controller 0 5m | Name | Description | |------|-------------| | [access\_entries](#output\_access\_entries) | The access\_entries object added to cluster | +| [ami\_type](#output\_ami\_type) | AMI type used for the EKS node group | | [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created | | [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created | | [cluster\_addons](#output\_cluster\_addons) | Map of attribute maps for all EKS cluster addons enabled | diff --git a/main.tf b/main.tf index 3202a0c..270599d 100644 --- a/main.tf +++ b/main.tf @@ -29,7 +29,7 @@ resource "terraform_data" "subnet_validation" { } module "cluster" { - source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks/?ref=v21.15.1" + source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks/?ref=v21.23.0" access_entries = local.access_entries cloudwatch_log_group_retention_in_days = var.cloudwatch_retention_days @@ -63,7 +63,7 @@ module "cluster" { eks_managed_node_groups = { karpenter = { name = local.ng_name - ami_type = "BOTTLEROCKET_x86_64" + ami_type = var.ami_type capacity_type = "ON_DEMAND" instance_types = var.eks_instance_types diff --git a/outputs.tf b/outputs.tf index 3c868cb..3dec90b 100644 --- a/outputs.tf +++ b/outputs.tf @@ -281,3 +281,8 @@ output "node_group_name" { description = "name of the node group created for use by karpenter" value = local.ng_name } + +output "ami_type" { + description = "AMI type used for the EKS node group" + value = var.ami_type +} diff --git a/variables.tf b/variables.tf index f4463ec..bb30de3 100644 --- a/variables.tf +++ b/variables.tf @@ -1,3 +1,9 @@ +variable "ami_type" { + description = "AMI type to use for the EKS node group" + type = string + default = "" +} + variable "cluster_name" { description = "EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev)" type = string
"148.129.0.0/16",
"172.16.0.0/12",
"192.168.0.0/16",
"10.0.0.0/16"
]