From 36c6bd764e93db532d31040682b2f73308f70e8f Mon Sep 17 00:00:00 2001
From: maxim <nikromax@gmail.com>
Date: Wed, 17 Nov 2021 10:58:24 +0600
Subject: [PATCH] refactor: do not use
 templates/aws-node-termination-handler-values.yaml and set necessary values
 in the eks-aws-node-termination-handler.tf file

---
 .../eks-aws-node-termination-handler.tf       | 20 +++++++++++++++++--
 terraform/layer2-k8s/helm-releases.yaml       |  2 +-
 .../aws-node-termination-handler-values.yaml  | 14 -------------
 3 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml

diff --git a/terraform/layer2-k8s/eks-aws-node-termination-handler.tf b/terraform/layer2-k8s/eks-aws-node-termination-handler.tf
index ecf504d2..f3e216ab 100644
--- a/terraform/layer2-k8s/eks-aws-node-termination-handler.tf
+++ b/terraform/layer2-k8s/eks-aws-node-termination-handler.tf
@@ -4,9 +4,25 @@ locals {
     enabled       = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].enabled
     chart         = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].chart
     repository    = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].repository
-    chart_version = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].version
+    chart_version = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].chart_version
     namespace     = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].namespace
   }
+  aws_node_termination_handler_values = <<VALUES
+enableSpotInterruptionDraining: true
+enableRebalanceMonitoring: true
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: eks.amazonaws.com/capacityType
+          operator: In
+          values:
+          - SPOT
+        - key: eks.amazonaws.com/nodegroup
+          operator: DoesNotExist
+VALUES
 }
 
 #tfsec:ignore:kubernetes-network-no-public-egress tfsec:ignore:kubernetes-network-no-public-ingress
@@ -68,7 +84,7 @@ resource "helm_release" "aws_node_termination_handler" {
   max_history = var.helm_release_history_size
 
   values = [
-    file("${path.module}/templates/aws-node-termination-handler-values.yaml")
+    local.aws_node_termination_handler_values
   ]
 
 }
diff --git a/terraform/layer2-k8s/helm-releases.yaml b/terraform/layer2-k8s/helm-releases.yaml
index 7642ef6a..54f826ed 100644
--- a/terraform/layer2-k8s/helm-releases.yaml
+++ b/terraform/layer2-k8s/helm-releases.yaml
@@ -9,7 +9,7 @@ releases:
     enabled: true
     chart: aws-node-termination-handler
     repository: https://aws.github.io/eks-charts
-    version: 0.13.3
+    chart_version: 0.13.3
     namespace: aws-node-termination-handler
   - id: aws-calico
     enabled: true
diff --git a/terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml b/terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml
deleted file mode 100644
index f9e3ea6e..00000000
--- a/terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-enableSpotInterruptionDraining: true
-enableRebalanceMonitoring: true
-
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: eks.amazonaws.com/capacityType
-          operator: In
-          values:
-          - SPOT
-        - key: eks.amazonaws.com/nodegroup
-          operator: DoesNotExist