From ad9bd902fe66537cea59ad30df9035fe6f16f5bd Mon Sep 17 00:00:00 2001
From: maxim <nikromax@gmail.com>
Date: Wed, 17 Nov 2021 10:47:59 +0600
Subject: [PATCH] refactor: do not use
 templates/alb-ingress-controller-values.yaml and set necessary values in a
 .tf file

---
 .../eks-aws-loadbalancer-controller.tf        | 31 +++++++++++++------
 terraform/layer2-k8s/helm-releases.yaml       |  2 +-
 .../alb-ingress-controller-values.yaml        | 19 ------------
 3 files changed, 23 insertions(+), 29 deletions(-)
 delete mode 100644 terraform/layer2-k8s/templates/alb-ingress-controller-values.yaml

diff --git a/terraform/layer2-k8s/eks-aws-loadbalancer-controller.tf b/terraform/layer2-k8s/eks-aws-loadbalancer-controller.tf
index 43a36981..21b80744 100644
--- a/terraform/layer2-k8s/eks-aws-loadbalancer-controller.tf
+++ b/terraform/layer2-k8s/eks-aws-loadbalancer-controller.tf
@@ -4,16 +4,29 @@ locals {
     enabled       = local.helm_releases[index(local.helm_releases.*.id, "aws-load-balancer-controller")].enabled
     chart         = local.helm_releases[index(local.helm_releases.*.id, "aws-load-balancer-controller")].chart
     repository    = local.helm_releases[index(local.helm_releases.*.id, "aws-load-balancer-controller")].repository
-    chart_version = local.helm_releases[index(local.helm_releases.*.id, "aws-load-balancer-controller")].version
+    chart_version = local.helm_releases[index(local.helm_releases.*.id, "aws-load-balancer-controller")].chart_version
     namespace     = local.helm_releases[index(local.helm_releases.*.id, "aws-load-balancer-controller")].namespace
   }
-  alb_ingress_controller = templatefile("${path.module}/templates/alb-ingress-controller-values.yaml",
-    {
-      role_arn     = local.aws_load_balancer_controller.enabled ? module.aws_iam_aws_loadbalancer_controller[0].role_arn : "",
-      region       = local.region,
-      cluster_name = local.eks_cluster_id,
-      vpc_id       = local.vpc_id
-  })
+  aws_load_balancer_controller_values = <<VALUES
+clusterName: ${local.eks_cluster_id}
+region: ${local.region}
+vpcId: ${local.eks_cluster_id}
+
+serviceAccount:
+  create: true
+  annotations:
+     "eks.amazonaws.com/role-arn": ${local.aws_load_balancer_controller.enabled ? module.aws_iam_aws_loadbalancer_controller[0].role_arn : ""}
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: eks.amazonaws.com/capacityType
+          operator: In
+          values:
+            - ON_DEMAND
+VALUES
 }
 
 #tfsec:ignore:kubernetes-network-no-public-egress tfsec:ignore:kubernetes-network-no-public-ingress
@@ -318,7 +331,7 @@ resource "helm_release" "aws_loadbalancer_controller" {
   max_history = var.helm_release_history_size
 
   values = [
-    local.alb_ingress_controller
+    local.aws_load_balancer_controller_values
   ]
 
 }
diff --git a/terraform/layer2-k8s/helm-releases.yaml b/terraform/layer2-k8s/helm-releases.yaml
index 7642ef6a..e2db9c31 100644
--- a/terraform/layer2-k8s/helm-releases.yaml
+++ b/terraform/layer2-k8s/helm-releases.yaml
@@ -3,7 +3,7 @@ releases:
     enabled: false
     chart: aws-load-balancer-controller
     repository: https://aws.github.io/eks-charts
-    version: 1.2.6
+    chart_version: 1.2.6
     namespace: aws-load-balancer-controller
   - id: aws-node-termination-handler
     enabled: true
diff --git a/terraform/layer2-k8s/templates/alb-ingress-controller-values.yaml b/terraform/layer2-k8s/templates/alb-ingress-controller-values.yaml
deleted file mode 100644
index 555151fd..00000000
--- a/terraform/layer2-k8s/templates/alb-ingress-controller-values.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-clusterName: ${cluster_name}
-
-region: ${region}
-vpcId: ${vpc_id}
-
-serviceAccount:
-  create: true
-  annotations:
-     "eks.amazonaws.com/role-arn": ${role_arn}
-
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: eks.amazonaws.com/capacityType
-          operator: In
-          values:
-            - ON_DEMAND