From ad97735fe59a194c6fd8a1c8acc3fd0afee9dd90 Mon Sep 17 00:00:00 2001
From: Andreas Frisch <andreas.frisch@gmail.com>
Date: Wed, 16 Sep 2026 08:43:49 +0200
Subject: [PATCH] remove unused resources

---
 _sub/compute/eks-heptio/main.tf | 45 ---------------------------------
 _sub/compute/eks-heptio/vars.tf | 13 ----------
 compute/eks-ec2/main.tf         | 26 ++++++-------------
 compute/eks-ec2/outputs.tf      |  8 ------
 compute/eks-ec2/vars.tf         | 15 -----------
 5 files changed, 8 insertions(+), 99 deletions(-)

diff --git a/_sub/compute/eks-heptio/main.tf b/_sub/compute/eks-heptio/main.tf
index e800c0288..d2e5204f8 100644
--- a/_sub/compute/eks-heptio/main.tf
+++ b/_sub/compute/eks-heptio/main.tf
@@ -15,48 +15,3 @@ resource "local_file" "kubeconfig_admin" {
   }
 }
 
-
-# --------------------------------------------------
-# AWS auth configmap - default or from Blaster S3 bucket
-# --------------------------------------------------
-
-locals {
-  path_default_configmap = "${path.cwd}/default-auth-cm.yaml"
-}
-
-resource "local_file" "default-configmap" {
-  content  = local.default_auth_cm_template
-  filename = local.path_default_configmap
-}
-
-resource "null_resource" "enable-workers-default" {
-  count = var.blaster_configmap_apply ? 0 : 1
-
-  provisioner "local-exec" {
-    command = "kubectl --kubeconfig ${var.kubeconfig_path} apply -f ${local.path_default_configmap}"
-  }
-
-  depends_on = [
-    local_file.kubeconfig_admin,
-    local_file.default-configmap,
-  ]
-}
-
-resource "null_resource" "enable-workers-from-s3" {
-  count = var.blaster_configmap_apply ? 1 : 0
-
-  # Terraform does not seem to re-run script, unless a trigger is defined
-  triggers = {
-    timestamp = timestamp()
-  }
-
-  provisioner "local-exec" {
-    command = "bash ${path.module}/apply_blaster_configmap.sh ${data.aws_region.current.region} ${var.kubeconfig_path} ${var.blaster_configmap_s3_bucket} ${var.blaster_configmap_key} ${local.path_default_configmap} ${var.aws_assume_role_arn}"
-    quiet   = true
-  }
-
-  depends_on = [
-    local_file.kubeconfig_admin,
-    local_file.default-configmap,
-  ]
-}
diff --git a/_sub/compute/eks-heptio/vars.tf b/_sub/compute/eks-heptio/vars.tf
index 068aed841..22f27fd5d 100644
--- a/_sub/compute/eks-heptio/vars.tf
+++ b/_sub/compute/eks-heptio/vars.tf
@@ -18,19 +18,6 @@ variable "aws_assume_role_arn" {
   type = string
 }
 
-variable "blaster_configmap_apply" {
-  type    = bool
-  default = false
-}
-
-variable "blaster_configmap_s3_bucket" {
-  type = string
-}
-
-variable "blaster_configmap_key" {
-  type = string
-}
-
 variable "kubeconfig_path" {
   type = string
 }
diff --git a/compute/eks-ec2/main.tf b/compute/eks-ec2/main.tf
index 053672b1a..a3fd252a4 100644
--- a/compute/eks-ec2/main.tf
+++ b/compute/eks-ec2/main.tf
@@ -268,25 +268,15 @@ module "eks_managed_workers_node_group" {
 # OTHER
 # --------------------------------------------------
 
-module "blaster_configmap_bucket" {
-  source          = "../../_sub/storage/s3-bucket"
-  deploy          = length(var.blaster_configmap_bucket) >= 1 ? true : false
-  s3_bucket       = var.blaster_configmap_bucket
-  additional_tags = var.blaster_configmap_bucket_tags
-}
-
 module "eks_heptio" {
-  source                      = "../../_sub/compute/eks-heptio"
-  cluster_name                = var.eks_cluster_name
-  kubeconfig_path             = local.kubeconfig_path
-  eks_endpoint                = module.eks_cluster.eks_endpoint
-  eks_certificate_authority   = module.eks_cluster.eks_certificate_authority
-  eks_role_arn                = module.eks_workers.worker_role
-  blaster_configmap_apply     = length(var.blaster_configmap_bucket) >= 1 ? true : false
-  blaster_configmap_s3_bucket = module.blaster_configmap_bucket.bucket_name
-  blaster_configmap_key       = "configmap_${module.eks_heptio.cluster_name}_blaster.yml"
-  aws_assume_role_arn         = var.aws_assume_role_arn
-  eks_k8s_auth_api_version    = var.eks_k8s_auth_api_version
+  source                    = "../../_sub/compute/eks-heptio"
+  cluster_name              = var.eks_cluster_name
+  kubeconfig_path           = local.kubeconfig_path
+  eks_endpoint              = module.eks_cluster.eks_endpoint
+  eks_certificate_authority = module.eks_cluster.eks_certificate_authority
+  eks_role_arn              = module.eks_workers.worker_role
+  aws_assume_role_arn       = var.aws_assume_role_arn
+  eks_k8s_auth_api_version  = var.eks_k8s_auth_api_version
 }
 
 module "efs_fs" {
diff --git a/compute/eks-ec2/outputs.tf b/compute/eks-ec2/outputs.tf
index 46d5296b5..cdbd51465 100644
--- a/compute/eks-ec2/outputs.tf
+++ b/compute/eks-ec2/outputs.tf
@@ -56,14 +56,6 @@ output "eks_cluster_nodes_sg_id" {
   value = module.eks_workers_security_group.id
 }
 
-# --------------------------------------------------
-# Misc
-# --------------------------------------------------
-
-output "blaster_configmap_bucket" {
-  value = module.blaster_configmap_bucket.bucket_name
-}
-
 output "eks_control_subnet_ids" {
   value = module.eks_cluster.subnet_ids
 }
diff --git a/compute/eks-ec2/vars.tf b/compute/eks-ec2/vars.tf
index 2ba847517..9d80624ce 100644
--- a/compute/eks-ec2/vars.tf
+++ b/compute/eks-ec2/vars.tf
@@ -182,21 +182,6 @@ variable "eks_managed_nodegroups" {
   }
 }
 
-# --------------------------------------------------
-# Blaster Configmap
-# --------------------------------------------------
-
-variable "blaster_configmap_bucket" {
-  type    = string
-  default = ""
-}
-
-variable "blaster_configmap_bucket_tags" {
-  description = "Add additional tags to s3 bucket"
-  type        = map(string)
-  default     = {}
-}
-
 # --------------------------------------------------
 # Cloudwatch agent setup
 # --------------------------------------------------