Skip to content

Commit

Permalink
Late reviewer feedback for PR #139
Browse files Browse the repository at this point in the history
  • Loading branch information
Nuru committed Aug 3, 2023
1 parent fa5a07b commit c19978e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
8 changes: 1 addition & 7 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ locals {
}
)
node_group_tags = merge(local.node_tags, local.autoscaler_enabled ? local.autoscaler_tags : null)

windows_taint = [{
key = "OS"
value = "Windows"
effect = "NO_SCHEDULE"
}]
}

module "label" {
Expand Down Expand Up @@ -82,7 +76,7 @@ locals {
capacity_type = var.capacity_type
labels = var.kubernetes_labels == null ? {} : var.kubernetes_labels

taints = local.is_windows ? concat(local.windows_taint, var.kubernetes_taints) : var.kubernetes_taints
taints = var.kubernetes_taints
release_version = local.launch_template_ami == "" ? try(var.ami_release_version[0], null) : null
version = length(compact(concat([local.launch_template_ami], var.ami_release_version))) == 0 ? try(var.kubernetes_version[0], null) : null

Expand Down
1 change: 0 additions & 1 deletion userdata.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Content-Type: multipart/mixed; boundary="/:/+++"
--/:/+++
Content-Type: text/x-shellscript; charset="us-ascii"
#!/bin/bash
set -ex

# In multipart MIME format to support EKS appending to it

Expand Down

0 comments on commit c19978e

Please sign in to comment.