xpk/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/terraform-aws-modules/terraform-aws-eks.git synced 2025-09-09 19:32:58 +08:00
Code Activity

Merge branch 'master' into add-destroy-time-flag

Browse Source
This commit is contained in:
Tomislav Tomašić
2019-11-20 13:08:06 +00:00
committed by GitHub
parent 8e1526b868 b69c8fb759
commit af854c37ba
5 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data.tf
+6 -3
View File
@@ -1,6 +1,10 @@
locals {
worker_ami_name_filter = var.worker_ami_name_filter != "" ? var.worker_ami_name_filter : "amazon-eks-node-${var.cluster_version}-v*"
worker_ami_name_filter_windows = var.worker_ami_name_filter_windows != "" ? var.worker_ami_name_filter_windows : "Windows_Server-2019-English-Core-EKS_Optimized-${var.cluster_version}-*"
worker_ami_name_filter = var.worker_ami_name_filter != "" ? var.worker_ami_name_filter : "amazon-eks-node-${var.cluster_version}-v*"
# Windows nodes are available from k8s 1.14. If cluster version is less than 1.14, fix ami filter to some constant to not fail on 'terraform plan'.
worker_ami_name_filter_windows = (var.worker_ami_name_filter_windows != "" ?
var.worker_ami_name_filter_windows : "Windows_Server-2019-English-Core-EKS_Optimized-${tonumber(var.cluster_version) >= 1.14 ? var.cluster_version : 1.14}-*"
)
}
data "aws_iam_policy_document" "workers_assume_role_policy" {
@@ -42,7 +46,6 @@ data "aws_ami" "eks_worker_windows" {
most_recent = true
# Owner ID of AWS EKS team (windows)
owners = [var.worker_ami_owner_id_windows]
}