From dbc27abdc0c76c8c9d4c605f03296bbcfad4e0d6 Mon Sep 17 00:00:00 2001
From: RFN <37929910+nicosuter@users.noreply.github.com>
Date: Thu, 14 May 2026 12:20:15 +0200
Subject: [PATCH] auto-delete underlying EBS/EFS vols when deleting PVC

---
 modules/aws/eks-addons/efs-csi.tf | 2 +-
 modules/aws/eks-addons/main.tf    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/aws/eks-addons/efs-csi.tf b/modules/aws/eks-addons/efs-csi.tf
index 34d9ec2..6cf79a5 100644
--- a/modules/aws/eks-addons/efs-csi.tf
+++ b/modules/aws/eks-addons/efs-csi.tf
@@ -153,7 +153,7 @@ resource "kubectl_manifest" "efs_storageclass" {
       gidRangeStart  = "1000"
       gidRangeEnd    = "2000"
     }
-    reclaimPolicy        = "Retain"
+    reclaimPolicy        = "Delete"
     volumeBindingMode    = "Immediate"
     allowVolumeExpansion = true
   })
diff --git a/modules/aws/eks-addons/main.tf b/modules/aws/eks-addons/main.tf
index 254ed09..251ff11 100644
--- a/modules/aws/eks-addons/main.tf
+++ b/modules/aws/eks-addons/main.tf
@@ -119,6 +119,7 @@ resource "terraform_data" "gp3_default_storageclass" {
     command = <<-EOT
       kubectl patch storageclass gp3 -p '{"metadata":{"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}' --type=merge
       kubectl patch storageclass gp3 -p '{"allowVolumeExpansion":true}' --type=merge
+      kubectl patch storageclass gp3 -p '{"reclaimPolicy":"Delete"}' --type=merge
       kubectl patch storageclass gp2 -p '{"metadata":{"annotations":{"storageclass.kubernetes.io/is-default-class":null}}}' --type=merge 2>/dev/null || true
     EOT
   }