create 1.35 upgrade from 1.34, recreate 1.34 so tags changes are on 1.35

terraform-modules · Jun 22, 2026 · 168444f · 168444f
1 parent 8678692
commit 168444f
Show file tree

Hide file tree

Showing 295 changed files with 12,725 additions and 1,135 deletions.
diff --git a/examples/full-cluster-tf-upgrade/1.33-1.34.diffs b/examples/full-cluster-tf-upgrade/1.33-1.34.diffs
diff --git a/examples/full-cluster-tf-upgrade/1.34-1.35.diffs b/examples/full-cluster-tf-upgrade/1.34-1.35.diffs
diff --git a/examples/full-cluster-tf-upgrade/1.34/README.md b/examples/full-cluster-tf-upgrade/1.34/README.md
@@ -75,7 +75,7 @@ Here is a sample file:
 
 ```hcl
 cluster_name           = "org-project-env"
-cluster_version        = "1.34"
+cluster_version        = "1.33"
 region                 = "us-gov-east-1"
 domain                 = "org-project-env.env.domain.census.gov"
 contact_email          = "org-project-env-group-mailing-list@census.gov"
@@ -470,7 +470,3 @@ clusterrolebinding.rbac.authorization.k8s.io/eks-console-dashboard-full-access-b
 - 2.7.0 -- 2026-04-16
   - update to 1.33
   - only addons updated from 1.32.  needs more changes to make it work
-
-- 2.8.0 -- 2026-04-16
-  - update to 1.34
-  - only addons updated from 1.32.  needs more changes to make it work
diff --git a/examples/full-cluster-tf-upgrade/1.34/addons/addon_cloudwatch.tf b/examples/full-cluster-tf-upgrade/1.34/addons/addon_cloudwatch.tf
@@ -43,15 +43,13 @@ module "role_cloudwatch-observability" {
   }
 
   tags = merge(
-    {
-      "eks:namespace" = local.cloudwatch_observability_namespace
-      "eks:user"      = local.cloudwatch_observability_name
-    },
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
     var.application_tags,
+    {
+      "eks:namespace" = local.cloudwatch_observability_namespace
+      "eks:user"      = local.cloudwatch_observability_name
+    }
   )
 }
 
@@ -63,8 +61,6 @@ resource "aws_cloudwatch_log_group" "cloudwatch-observability" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["cloudwatch"],
-    module.tags.tags,
     var.application_tags,
   )
 }
diff --git a/examples/full-cluster-tf-upgrade/1.34/addons/addon_ebs-csi.tf b/examples/full-cluster-tf-upgrade/1.34/addons/addon_ebs-csi.tf
@@ -97,12 +97,10 @@ module "role_ebs-driver" {
   attached_policies      = [data.aws_iam_policy.ebs-provisioner.arn]
 
   tags = merge(
-    { "Name" = format("%v%v-ebs-driver", local._prefixes["eks-role"], var.cluster_name) },
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
     var.application_tags,
+    { "Name" = format("%v%v-ebs-driver", local._prefixes["eks-role"], var.cluster_name) },
   )
 }
 

diff --git a/examples/full-cluster-tf-upgrade/1.34/addons/addon_vpc-cni.tf b/examples/full-cluster-tf-upgrade/1.34/addons/addon_vpc-cni.tf
@@ -70,10 +70,8 @@ module "role_vpc-cni" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
-    tomap({ "Name" = format("%v%v-vpc-cni", local._prefixes["eks-role"], var.cluster_name) }),
     var.application_tags,
+    tomap({ "Name" = format("%v%v-ebs-driver", local._prefixes["eks-role"], var.cluster_name) }),
   )
 }
 

diff --git a/examples/full-cluster-tf-upgrade/1.34/addons/tf-run.data b/examples/full-cluster-tf-upgrade/1.34/addons/tf-run.data
@@ -20,8 +20,6 @@ LINK includes.d/kubeconfig.eks-subdirectory.tf
 LINK variables.eks.tf
 LINK prefixes.tf
 LINK providers.tf
-LINK tags.tf
-LINK tags.yml
 LINK variables.addons.tf
 LINK versions.tf
 LINK version.tf

diff --git a/examples/full-cluster-tf-upgrade/1.34/cluster-roles/dba.iam.tf b/examples/full-cluster-tf-upgrade/1.34/cluster-roles/dba.iam.tf
@@ -15,8 +15,6 @@ module "role_dba_administrator" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
     var.application_tags,
   )
 }
@@ -104,8 +102,6 @@ module "group_dba_administrator" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
     var.application_tags,
   )
 }

diff --git a/examples/full-cluster-tf-upgrade/1.34/cluster-roles/deployer.iam.tf b/examples/full-cluster-tf-upgrade/1.34/cluster-roles/deployer.iam.tf
@@ -28,8 +28,6 @@ module "service_cicd_deployer" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
     var.application_tags,
   )
 }
@@ -46,8 +44,6 @@ module "role_cicd_deployer" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
     var.application_tags,
   )
 }
@@ -156,8 +152,6 @@ module "group_cicd_deployer" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
     var.application_tags,
   )
 }

diff --git a/examples/full-cluster-tf-upgrade/1.34/cluster-roles/tf-run.data b/examples/full-cluster-tf-upgrade/1.34/cluster-roles/tf-run.data
@@ -8,8 +8,6 @@ LINKTOP init
 LINKTOP provider_configs.d/provider.ldap_new.auto.tfvars
 LINKTOP provider_configs.d/provider.ldap_new.tf
 LINKTOP provider_configs.d/provider.ldap_new.variables.tf
-LINK tags.tf
-LINK tags.yml
 LINK versions.tf
 LINK settings.auto.tfvars
 LINK variables.application_tags.auto.tfvars

diff --git a/examples/full-cluster-tf-upgrade/1.34/common-services/cert-manager-issuer.tf b/examples/full-cluster-tf-upgrade/1.34/common-services/cert-manager-issuer.tf
@@ -8,10 +8,8 @@ module "subordinate_ca" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["acm_pca"],
-    module.tags.tags,
     var.account_tags,
-    var.application_tags,
     var.infrastructure_tags,
+    var.application_tags,
   )
 }
diff --git a/...les/full-cluster-tf-upgrade/1.34/common-services/cluster-autoscaler/cluster-autoscaler.tf b/...les/full-cluster-tf-upgrade/1.34/common-services/cluster-autoscaler/cluster-autoscaler.tf
@@ -2,7 +2,7 @@ module "role_cluster-autoscaler" {
   source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts"
 
   description = "EKS IAM Role for ${var.cluster_name} for service account ${var.cluster_autoscaler_namespace}:${var.cluster_autoscaler_name}"
-  name        = format("%v%v-irsa__%v", local._prefixes["eks-role"], var.cluster_name, "as")
+  name        = format("%v%v-irsa__%v", local._prefixes["eks-role"], var.cluster_name, "autoscaler")
 
   attach_cluster_autoscaler_policy = true
   cluster_autoscaler_cluster_names = [var.cluster_name]
@@ -20,8 +20,6 @@ module "role_cluster-autoscaler" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["iam"],
-    module.tags.tags,
     var.application_tags,
     {
       "eks:namespace" = var.cluster_autoscaler_namespace
@@ -51,8 +49,6 @@ module "images_cluster_autoscaler" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["ecr"],
-    module.tags.tags,
     var.application_tags,
   )
 }

diff --git a/examples/full-cluster-tf-upgrade/1.34/common-services/cluster-autoscaler/tf-run.data b/examples/full-cluster-tf-upgrade/1.34/common-services/cluster-autoscaler/tf-run.data
@@ -23,8 +23,6 @@ LINK includes.d/kubeconfig.eks-subdirectory.tf
 LINK variables.eks.tf
 LINK prefixes.tf
 LINK providers.tf
-LINK tags.tf
-LINK tags.yml
 LINK variables.addons.tf
 LINK versions.tf
 LINK version.tf

diff --git a/examples/full-cluster-tf-upgrade/1.34/common-services/images.tf b/examples/full-cluster-tf-upgrade/1.34/common-services/images.tf
@@ -22,8 +22,6 @@ module "images" {
   tags = merge(
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["ecr"],
-    module.tags.tags,
     var.application_tags,
   )
 

diff --git a/examples/full-cluster-tf-upgrade/1.34/dns-zone.tf b/examples/full-cluster-tf-upgrade/1.34/dns-zone.tf
@@ -57,13 +57,11 @@ resource "aws_route53_zone" "cluster_domain" {
   }
 
   tags = merge(
-    { "Name" = local.cluster_domain_name },
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["route53"],
-    module.tags.tags,
-    var.application_tags,
     var.tags,
+    var.application_tags,
+    { "Name" = local.cluster_domain_name },
   )
 }
 
@@ -83,10 +81,7 @@ module "route53_cluster_domain_east" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["route53"],
-    module.tags.tags,
     var.application_tags,
   )
 }
@@ -104,10 +99,7 @@ module "route53_cluster_domain_west" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["route53"],
-    module.tags.tags,
     var.application_tags,
   )
 }
@@ -175,10 +167,8 @@ module "route53_main_east" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    module.tags.finops_roles["route53"],
-    module.tags.tags,
-    var.application_tags,
     local.common_tags,
+    var.application_tags,
   )
 }
 
@@ -195,10 +185,8 @@ module "route53_main_west" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    module.tags.finops_roles["route53"],
-    module.tags.tags,
-    var.application_tags,
     local.common_tags,
+    var.application_tags,
   )
 }
 
@@ -228,10 +216,8 @@ module "route53_main_legacy_east" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    module.tags.finops_roles["route53"],
-    module.tags.tags,
-    var.application_tags,
     local.common_tags,
+    var.application_tags,
   )
 }
 
@@ -248,10 +234,8 @@ module "route53_main_legacy_west" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    module.tags.finops_roles["route53"],
-    module.tags.tags,
-    var.application_tags,
     local.common_tags,
+    var.application_tags,
   )
 }
 
diff --git a/examples/full-cluster-tf-upgrade/1.34/dns-zone.tf.dmz b/examples/full-cluster-tf-upgrade/1.34/dns-zone.tf.dmz
@@ -57,13 +57,11 @@ resource "aws_route53_zone" "cluster_domain" {
   }
 
   tags = merge(
-    { "Name" = local.cluster_domain_name },
     local.base_tags,
     local.common_tags,
-    module.tags.finops_roles["route53"],
-    module.tags.tags,
-    var.application_tags,
     var.tags,
+    var.application_tags,
+    { "Name" = local.cluster_domain_name },
   )
 }
 
@@ -83,10 +81,8 @@ module "route53_cluster_domain_east" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    module.tags.tags,
-    module.tags.finops_roles["route53"],
-    var.application_tags,
     local.common_tags,
+    var.application_tags,
   )
 }
 
@@ -103,10 +99,8 @@ module "route53_cluster_domain_west" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    module.tags.tags,
-    module.tags.finops_roles["route53"],
-    var.application_tags,
     local.common_tags,
+    var.application_tags,
   )
 }
 
@@ -162,10 +156,8 @@ module "route53_main_east" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    module.tags.tags,
-    module.tags.finops_roles["route53"],
-    var.application_tags,
     local.common_tags,
+    var.application_tags,
   )
 }
 
@@ -181,9 +173,7 @@ module "route53_main_west" {
   zone_ids = [aws_route53_zone.cluster_domain.zone_id]
 
   tags = merge(
-    module.tags.tags,
-    module.tags.finops_roles["route53"],
-    var.application_tags,
     local.common_tags,
+    var.application_tags,
   )
 }