diff --git a/README.md b/README.md
index a450348..d67d537 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ efs-csi-controller 0 5m
| Name | Source | Version |
|------|--------|---------|
| [cloudwatch\_observability\_irsa\_role](#module\_cloudwatch\_observability\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
-| [cluster](#module\_cluster) | git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git | v20.33.1 |
+| [cluster](#module\_cluster) | git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git | v20.34.0 |
| [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
| [efs\_csi\_irsa\_role](#module\_efs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
| [vpc\_cni\_irsa\_role](#module\_vpc\_cni\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
diff --git a/main.tf b/main.tf
index 709cb98..907f035 100644
--- a/main.tf
+++ b/main.tf
@@ -1,31 +1,3 @@
-data "aws_vpc" "eks_vpc" {
- filter {
- name = "tag:Name"
- values = [var.vpc_name]
- }
-}
-
-data "aws_subnets" "subnets" {
- filter {
- name = "tag:Name"
- values = [var.subnets_name]
- }
- filter {
- name = "vpc-id"
- values = [data.aws_vpc.eks_vpc.id]
- }
-}
-
-data "aws_subnet" "subnets" {
- for_each = toset(data.aws_subnets.subnets.ids)
- id = each.key
-}
-
-data "aws_ebs_default_kms_key" "current" {}
-
-data "aws_kms_key" "ebs_key" {
- key_id = data.aws_ebs_default_kms_key.current.key_arn
-}
locals {
additional_policies = {}
@@ -55,7 +27,7 @@ resource "terraform_data" "subnet_validation" {
}
module "cluster" {
- source = "git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git?ref=v20.33.1"
+ source = "git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git?ref=v20.34.0"
cluster_name = var.cluster_name
cluster_version = var.cluster_version
@@ -124,7 +96,7 @@ module "cluster" {
max_size = var.eks_ng_max_size
desired_size = var.eks_ng_desired_size
- iam_role_name = local.ng_name
+ iam_role_name = format("%v%v-nodegroup", local.prefixes["eks-role"], var.cluster_name)
iam_role_additional_policies = local.additional_policies
block_device_mappings = {
diff --git a/prefixes.tf b/prefixes.tf
index f677e0a..ac7b000 100644
--- a/prefixes.tf
+++ b/prefixes.tf
@@ -29,6 +29,6 @@ locals {
"eks-user" = "s-eks-"
"eks-role" = "r-eks-"
"eks-policy" = "p-eks-"
- "eks-security-group" = "eks-" # "sg-eks-"
+ "eks-security-group" = "sg-eks-" # "sg-eks-"
}
}