Merge pull request #18 from carlosrodlop/feat-branch

[AWS EKS Blueprints] Adding distiction between v4 and v5 charts for External DNS
carlosrodlop · Nov 8, 2023 · b347f54 · b347f54
2 parents 921f35d + b2f1c5c
commit b347f54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/clouds/aws/modules/aws-eks-addons-v4/main.tf b/clouds/aws/modules/aws-eks-addons-v4/main.tf
@@ -53,7 +53,7 @@ module "eks_blueprints_addons" {
 
   enable_external_dns = local.eks_bp_addon_external_dns
   external_dns_helm_config = {
-    values = [templatefile("${local.helm_values_path}/external-dns.yaml", {
+    values = [templatefile("${local.helm_values_path}/external-dns-v4.yaml", {
       zoneIdFilter = local.route53_zone_id
       zoneType     = local.hosted_zone_type
     })]

diff --git a/clouds/aws/modules/aws-eks-addons-v5/main.tf b/clouds/aws/modules/aws-eks-addons-v5/main.tf
@@ -60,10 +60,7 @@ module "eks_blueprints_addons" {
   enable_external_dns = local.eks_bp_addon_external_dns
   external_dns = {
     create_role = true,
-    values = [templatefile("${local.helm_values_path}/external-dns.yaml", {
-      zoneIdFilter = local.route53_zone_id
-      zoneType     = local.hosted_zone_type
-    })]
+    values      = [file("${local.helm_values_path}/external-dns-v5.yaml")]
   }
   external_dns_route53_zone_arns      = [local.route53_zone_arn]
   enable_aws_load_balancer_controller = local.eks_bp_addon_aws_lb_controller

diff --git a/libs/k8s b/libs/k8s