From fc0c9d7f4447a8c4a20a9547d43c72cbf9bfe941 Mon Sep 17 00:00:00 2001
From: maxim <nikromax@gmail.com>
Date: Wed, 17 Nov 2021 11:11:33 +0600
Subject: [PATCH] refactor: do not use templates/external-dns.yaml and set
 necessary values in the eks-external-dns.tf file

---
 terraform/layer2-k8s/eks-external-dns.tf      | 35 +++++++++++++------
 terraform/layer2-k8s/helm-releases.yaml       |  2 +-
 .../layer2-k8s/templates/external-dns.yaml    | 22 ------------
 3 files changed, 25 insertions(+), 34 deletions(-)
 delete mode 100644 terraform/layer2-k8s/templates/external-dns.yaml

diff --git a/terraform/layer2-k8s/eks-external-dns.tf b/terraform/layer2-k8s/eks-external-dns.tf
index 01822c6a..8260d929 100644
--- a/terraform/layer2-k8s/eks-external-dns.tf
+++ b/terraform/layer2-k8s/eks-external-dns.tf
@@ -4,20 +4,33 @@ locals {
     enabled       = local.helm_releases[index(local.helm_releases.*.id, "external-dns")].enabled
     chart         = local.helm_releases[index(local.helm_releases.*.id, "external-dns")].chart
     repository    = local.helm_releases[index(local.helm_releases.*.id, "external-dns")].repository
-    chart_version = local.helm_releases[index(local.helm_releases.*.id, "external-dns")].version
+    chart_version = local.helm_releases[index(local.helm_releases.*.id, "external-dns")].chart_version
     namespace     = local.helm_releases[index(local.helm_releases.*.id, "external-dns")].namespace
   }
-}
+  external_dns_values = <<VALUES
+rbac:
+  create: true
 
-data "template_file" "external_dns" {
-  count = local.external_dns.enabled ? 1 : 0
+serviceAccount:
+  create: true
+  name: "external-dns"
+  annotations:
+    "eks.amazonaws.com/role-arn": ${local.external_dns.enabled ? module.aws_iam_external_dns[0].role_arn : ""}
 
-  template = file("${path.module}/templates/external-dns.yaml")
-  vars = {
-    role_arn    = module.aws_iam_external_dns[count.index].role_arn
-    domain_name = local.domain_name
-    zone_type   = "public"
-  }
+provider: aws
+domainFilters: [${local.domain_name}]
+extraArgs:
+  - --aws-zone-type=public
+  - --aws-batch-change-size=1000
+
+serviceMonitor:
+  enabled: false
+
+sources:
+  - service
+  - ingress
+#  - istio-virtualservice
+VALUES
 }
 
 #tfsec:ignore:kubernetes-network-no-public-egress tfsec:ignore:kubernetes-network-no-public-ingress
@@ -121,7 +134,7 @@ resource "helm_release" "external_dns" {
   max_history = var.helm_release_history_size
 
   values = [
-    data.template_file.external_dns[count.index].rendered,
+    local.external_dns_values
   ]
 
 }
diff --git a/terraform/layer2-k8s/helm-releases.yaml b/terraform/layer2-k8s/helm-releases.yaml
index 7642ef6a..d12d7110 100644
--- a/terraform/layer2-k8s/helm-releases.yaml
+++ b/terraform/layer2-k8s/helm-releases.yaml
@@ -51,7 +51,7 @@ releases:
     enabled: true
     chart: external-dns
     repository: https://kubernetes-sigs.github.io/external-dns
-    version: 1.5.0
+    chart_version: 1.5.0
     namespace: external-dns
   - id: external-secrets
     enabled: true
diff --git a/terraform/layer2-k8s/templates/external-dns.yaml b/terraform/layer2-k8s/templates/external-dns.yaml
deleted file mode 100644
index c5e68194..00000000
--- a/terraform/layer2-k8s/templates/external-dns.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-rbac:
-  create: true
-
-serviceAccount:
-  create: true
-  name: "external-dns"
-  annotations:
-    "eks.amazonaws.com/role-arn": ${role_arn}
-
-provider: aws
-domainFilters: [${domain_name}]
-extraArgs:
-  - --aws-zone-type=${zone_type}
-  - --aws-batch-change-size=1000
-
-serviceMonitor:
-  enabled: false
-
-sources:
-  - service
-  - ingress
-#  - istio-virtualservice