Skip to content

Commit 1910946

Browse files
authored
refactor: do not use templates/aws-node-termination-handler-values.yaml and set necessary values in the eks-aws-node-termination-handler.tf file (#190)
1 parent 0403bac commit 1910946

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

terraform/layer2-k8s/eks-aws-node-termination-handler.tf

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,25 @@ locals {
44
enabled = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].enabled
55
chart = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].chart
66
repository = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].repository
7-
chart_version = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].version
7+
chart_version = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].chart_version
88
namespace = local.helm_releases[index(local.helm_releases.*.id, "aws-node-termination-handler")].namespace
99
}
10+
aws_node_termination_handler_values = <<VALUES
11+
enableSpotInterruptionDraining: true
12+
enableRebalanceMonitoring: true
13+
14+
affinity:
15+
nodeAffinity:
16+
requiredDuringSchedulingIgnoredDuringExecution:
17+
nodeSelectorTerms:
18+
- matchExpressions:
19+
- key: eks.amazonaws.com/capacityType
20+
operator: In
21+
values:
22+
- SPOT
23+
- key: eks.amazonaws.com/nodegroup
24+
operator: DoesNotExist
25+
VALUES
1026
}
1127

1228
#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" {
6884
max_history = var.helm_release_history_size
6985

7086
values = [
71-
file("${path.module}/templates/aws-node-termination-handler-values.yaml")
87+
local.aws_node_termination_handler_values
7288
]
7389

7490
}

terraform/layer2-k8s/helm-releases.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ releases:
99
enabled: true
1010
chart: aws-node-termination-handler
1111
repository: https://aws.github.io/eks-charts
12-
version: 0.13.3
12+
chart_version: 0.13.3
1313
namespace: aws-node-termination-handler
1414
- id: aws-calico
1515
enabled: true

terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)