Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions terraform/layer2-k8s/eks-aws-node-termination-handler.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
]

}
2 changes: 1 addition & 1 deletion terraform/layer2-k8s/helm-releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

This file was deleted.