mirror of
https://github.com/ysoftdevs/terraform-aws-eks.git
synced 2026-03-27 11:51:07 +01:00
fix: Revert removal of templates provider (#883)
Broke use case of passing in custom template content. Reverts most of the following PRs: - #865 - #863 - #854
This commit is contained in:
@@ -140,6 +140,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
|
|||||||
| local | >= 1.4 |
|
| local | >= 1.4 |
|
||||||
| null | >= 2.1 |
|
| null | >= 2.1 |
|
||||||
| random | >= 2.1 |
|
| random | >= 2.1 |
|
||||||
|
| template | >= 2.1 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
@@ -150,6 +151,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
|
|||||||
| local | >= 1.4 |
|
| local | >= 1.4 |
|
||||||
| null | >= 2.1 |
|
| null | >= 2.1 |
|
||||||
| random | >= 2.1 |
|
| random | >= 2.1 |
|
||||||
|
| template | >= 2.1 |
|
||||||
|
|
||||||
## Inputs
|
## Inputs
|
||||||
|
|
||||||
|
|||||||
92
data.tf
92
data.tf
@@ -55,6 +55,98 @@ data "aws_iam_policy_document" "cluster_assume_role_policy" {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data "template_file" "userdata" {
|
||||||
|
count = var.create_eks ? local.worker_group_count : 0
|
||||||
|
template = lookup(
|
||||||
|
var.worker_groups[count.index],
|
||||||
|
"userdata_template_file",
|
||||||
|
file(
|
||||||
|
lookup(var.worker_groups[count.index], "platform", local.workers_group_defaults["platform"]) == "windows"
|
||||||
|
? "${path.module}/templates/userdata_windows.tpl"
|
||||||
|
: "${path.module}/templates/userdata.sh.tpl"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
vars = merge({
|
||||||
|
platform = lookup(var.worker_groups[count.index], "platform", local.workers_group_defaults["platform"])
|
||||||
|
cluster_name = coalescelist(aws_eks_cluster.this[*].name, [""])[0]
|
||||||
|
endpoint = coalescelist(aws_eks_cluster.this[*].endpoint, [""])[0]
|
||||||
|
cluster_auth_base64 = coalescelist(aws_eks_cluster.this[*].certificate_authority[0].data, [""])[0]
|
||||||
|
pre_userdata = lookup(
|
||||||
|
var.worker_groups[count.index],
|
||||||
|
"pre_userdata",
|
||||||
|
local.workers_group_defaults["pre_userdata"],
|
||||||
|
)
|
||||||
|
additional_userdata = lookup(
|
||||||
|
var.worker_groups[count.index],
|
||||||
|
"additional_userdata",
|
||||||
|
local.workers_group_defaults["additional_userdata"],
|
||||||
|
)
|
||||||
|
bootstrap_extra_args = lookup(
|
||||||
|
var.worker_groups[count.index],
|
||||||
|
"bootstrap_extra_args",
|
||||||
|
local.workers_group_defaults["bootstrap_extra_args"],
|
||||||
|
)
|
||||||
|
kubelet_extra_args = lookup(
|
||||||
|
var.worker_groups[count.index],
|
||||||
|
"kubelet_extra_args",
|
||||||
|
local.workers_group_defaults["kubelet_extra_args"],
|
||||||
|
)
|
||||||
|
},
|
||||||
|
lookup(
|
||||||
|
var.worker_groups[count.index],
|
||||||
|
"userdata_template_extra_args",
|
||||||
|
local.workers_group_defaults["userdata_template_extra_args"]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
data "template_file" "launch_template_userdata" {
|
||||||
|
count = var.create_eks ? local.worker_group_launch_template_count : 0
|
||||||
|
template = lookup(
|
||||||
|
var.worker_groups_launch_template[count.index],
|
||||||
|
"userdata_template_file",
|
||||||
|
file(
|
||||||
|
lookup(var.worker_groups_launch_template[count.index], "platform", local.workers_group_defaults["platform"]) == "windows"
|
||||||
|
? "${path.module}/templates/userdata_windows.tpl"
|
||||||
|
: "${path.module}/templates/userdata.sh.tpl"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
vars = merge({
|
||||||
|
platform = lookup(var.worker_groups_launch_template[count.index], "platform", local.workers_group_defaults["platform"])
|
||||||
|
cluster_name = coalescelist(aws_eks_cluster.this[*].name, [""])[0]
|
||||||
|
endpoint = coalescelist(aws_eks_cluster.this[*].endpoint, [""])[0]
|
||||||
|
cluster_auth_base64 = coalescelist(aws_eks_cluster.this[*].certificate_authority[0].data, [""])[0]
|
||||||
|
pre_userdata = lookup(
|
||||||
|
var.worker_groups_launch_template[count.index],
|
||||||
|
"pre_userdata",
|
||||||
|
local.workers_group_defaults["pre_userdata"],
|
||||||
|
)
|
||||||
|
additional_userdata = lookup(
|
||||||
|
var.worker_groups_launch_template[count.index],
|
||||||
|
"additional_userdata",
|
||||||
|
local.workers_group_defaults["additional_userdata"],
|
||||||
|
)
|
||||||
|
bootstrap_extra_args = lookup(
|
||||||
|
var.worker_groups_launch_template[count.index],
|
||||||
|
"bootstrap_extra_args",
|
||||||
|
local.workers_group_defaults["bootstrap_extra_args"],
|
||||||
|
)
|
||||||
|
kubelet_extra_args = lookup(
|
||||||
|
var.worker_groups_launch_template[count.index],
|
||||||
|
"kubelet_extra_args",
|
||||||
|
local.workers_group_defaults["kubelet_extra_args"],
|
||||||
|
)
|
||||||
|
},
|
||||||
|
lookup(
|
||||||
|
var.worker_groups_launch_template[count.index],
|
||||||
|
"userdata_template_extra_args",
|
||||||
|
local.workers_group_defaults["userdata_template_extra_args"]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
data "aws_iam_role" "custom_cluster_iam_role" {
|
data "aws_iam_role" "custom_cluster_iam_role" {
|
||||||
count = var.manage_cluster_iam_resources ? 0 : 1
|
count = var.manage_cluster_iam_resources ? 0 : 1
|
||||||
name = var.cluster_iam_role_name
|
name = var.cluster_iam_role_name
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ provider "null" {
|
|||||||
version = "~> 2.1"
|
version = "~> 2.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
provider "template" {
|
||||||
|
version = "~> 2.1"
|
||||||
|
}
|
||||||
|
|
||||||
data "aws_eks_cluster" "cluster" {
|
data "aws_eks_cluster" "cluster" {
|
||||||
name = module.eks.cluster_id
|
name = module.eks.cluster_id
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,10 @@ provider "null" {
|
|||||||
version = "~> 2.1"
|
version = "~> 2.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
provider "template" {
|
||||||
|
version = "~> 2.1"
|
||||||
|
}
|
||||||
|
|
||||||
data "aws_eks_cluster" "cluster" {
|
data "aws_eks_cluster" "cluster" {
|
||||||
name = module.eks.cluster_id
|
name = module.eks.cluster_id
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ provider "null" {
|
|||||||
version = "~> 2.1"
|
version = "~> 2.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
provider "template" {
|
||||||
|
version = "~> 2.1"
|
||||||
|
}
|
||||||
|
|
||||||
data "aws_eks_cluster" "cluster" {
|
data "aws_eks_cluster" "cluster" {
|
||||||
name = module.eks.cluster_id
|
name = module.eks.cluster_id
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ provider "null" {
|
|||||||
version = "~> 2.1"
|
version = "~> 2.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
provider "template" {
|
||||||
|
version = "~> 2.1"
|
||||||
|
}
|
||||||
|
|
||||||
data "aws_eks_cluster" "cluster" {
|
data "aws_eks_cluster" "cluster" {
|
||||||
name = module.eks.cluster_id
|
name = module.eks.cluster_id
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ provider "null" {
|
|||||||
version = "~> 2.1"
|
version = "~> 2.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
provider "template" {
|
||||||
|
version = "~> 2.1"
|
||||||
|
}
|
||||||
|
|
||||||
data "aws_eks_cluster" "cluster" {
|
data "aws_eks_cluster" "cluster" {
|
||||||
name = module.eks.cluster_id
|
name = module.eks.cluster_id
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ provider "null" {
|
|||||||
version = "~> 2.1"
|
version = "~> 2.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
provider "template" {
|
||||||
|
version = "~> 2.1"
|
||||||
|
}
|
||||||
|
|
||||||
data "aws_eks_cluster" "cluster" {
|
data "aws_eks_cluster" "cluster" {
|
||||||
name = module.eks.cluster_id
|
name = module.eks.cluster_id
|
||||||
}
|
}
|
||||||
|
|||||||
88
local.tf
88
local.tf
@@ -147,92 +147,4 @@ locals {
|
|||||||
aws_authenticator_additional_args = var.kubeconfig_aws_authenticator_additional_args
|
aws_authenticator_additional_args = var.kubeconfig_aws_authenticator_additional_args
|
||||||
aws_authenticator_env_variables = var.kubeconfig_aws_authenticator_env_variables
|
aws_authenticator_env_variables = var.kubeconfig_aws_authenticator_env_variables
|
||||||
}) : ""
|
}) : ""
|
||||||
|
|
||||||
userdata = [for worker in var.worker_groups : templatefile(
|
|
||||||
lookup(
|
|
||||||
worker,
|
|
||||||
"userdata_template_file",
|
|
||||||
lookup(worker, "platform", local.workers_group_defaults["platform"]) == "windows"
|
|
||||||
? "${path.module}/templates/userdata_windows.tpl"
|
|
||||||
: "${path.module}/templates/userdata.sh.tpl"
|
|
||||||
),
|
|
||||||
merge(
|
|
||||||
{
|
|
||||||
platform = lookup(worker, "platform", local.workers_group_defaults["platform"])
|
|
||||||
cluster_name = aws_eks_cluster.this[0].name
|
|
||||||
endpoint = aws_eks_cluster.this[0].endpoint
|
|
||||||
cluster_auth_base64 = aws_eks_cluster.this[0].certificate_authority[0].data
|
|
||||||
pre_userdata = lookup(
|
|
||||||
worker,
|
|
||||||
"pre_userdata",
|
|
||||||
local.workers_group_defaults["pre_userdata"],
|
|
||||||
)
|
|
||||||
additional_userdata = lookup(
|
|
||||||
worker,
|
|
||||||
"additional_userdata",
|
|
||||||
local.workers_group_defaults["additional_userdata"],
|
|
||||||
)
|
|
||||||
bootstrap_extra_args = lookup(
|
|
||||||
worker,
|
|
||||||
"bootstrap_extra_args",
|
|
||||||
local.workers_group_defaults["bootstrap_extra_args"],
|
|
||||||
)
|
|
||||||
kubelet_extra_args = lookup(
|
|
||||||
worker,
|
|
||||||
"kubelet_extra_args",
|
|
||||||
local.workers_group_defaults["kubelet_extra_args"],
|
|
||||||
)
|
|
||||||
},
|
|
||||||
lookup(
|
|
||||||
worker,
|
|
||||||
"userdata_template_extra_args",
|
|
||||||
local.workers_group_defaults["userdata_template_extra_args"]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
) if var.create_eks
|
|
||||||
]
|
|
||||||
|
|
||||||
launch_template_userdata = [for worker in var.worker_groups_launch_template : templatefile(
|
|
||||||
lookup(
|
|
||||||
worker,
|
|
||||||
"userdata_template_file",
|
|
||||||
lookup(worker, "platform", local.workers_group_defaults["platform"]) == "windows"
|
|
||||||
? "${path.module}/templates/userdata_windows.tpl"
|
|
||||||
: "${path.module}/templates/userdata.sh.tpl"
|
|
||||||
),
|
|
||||||
merge(
|
|
||||||
{
|
|
||||||
platform = lookup(worker, "platform", local.workers_group_defaults["platform"])
|
|
||||||
cluster_name = aws_eks_cluster.this[0].name
|
|
||||||
endpoint = aws_eks_cluster.this[0].endpoint
|
|
||||||
cluster_auth_base64 = aws_eks_cluster.this[0].certificate_authority[0].data
|
|
||||||
pre_userdata = lookup(
|
|
||||||
worker,
|
|
||||||
"pre_userdata",
|
|
||||||
local.workers_group_defaults["pre_userdata"],
|
|
||||||
)
|
|
||||||
additional_userdata = lookup(
|
|
||||||
worker,
|
|
||||||
"additional_userdata",
|
|
||||||
local.workers_group_defaults["additional_userdata"],
|
|
||||||
)
|
|
||||||
bootstrap_extra_args = lookup(
|
|
||||||
worker,
|
|
||||||
"bootstrap_extra_args",
|
|
||||||
local.workers_group_defaults["bootstrap_extra_args"],
|
|
||||||
)
|
|
||||||
kubelet_extra_args = lookup(
|
|
||||||
worker,
|
|
||||||
"kubelet_extra_args",
|
|
||||||
local.workers_group_defaults["kubelet_extra_args"],
|
|
||||||
)
|
|
||||||
},
|
|
||||||
lookup(
|
|
||||||
worker,
|
|
||||||
"userdata_template_extra_args",
|
|
||||||
local.workers_group_defaults["userdata_template_extra_args"]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
) if var.create_eks
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,8 +95,8 @@ output "workers_asg_names" {
|
|||||||
output "workers_user_data" {
|
output "workers_user_data" {
|
||||||
description = "User data of worker groups"
|
description = "User data of worker groups"
|
||||||
value = concat(
|
value = concat(
|
||||||
local.userdata,
|
data.template_file.userdata.*.rendered,
|
||||||
local.launch_template_userdata,
|
data.template_file.launch_template_userdata.*.rendered,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ terraform {
|
|||||||
aws = ">= 2.52.0"
|
aws = ">= 2.52.0"
|
||||||
local = ">= 1.4"
|
local = ">= 1.4"
|
||||||
null = ">= 2.1"
|
null = ">= 2.1"
|
||||||
|
template = ">= 2.1"
|
||||||
random = ">= 2.1"
|
random = ">= 2.1"
|
||||||
kubernetes = ">= 1.11.1"
|
kubernetes = ">= 1.11.1"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ resource "aws_launch_configuration" "workers" {
|
|||||||
"key_name",
|
"key_name",
|
||||||
local.workers_group_defaults["key_name"],
|
local.workers_group_defaults["key_name"],
|
||||||
)
|
)
|
||||||
user_data_base64 = base64encode(local.userdata[count.index])
|
user_data_base64 = base64encode(data.template_file.userdata.*.rendered[count.index])
|
||||||
ebs_optimized = lookup(
|
ebs_optimized = lookup(
|
||||||
var.worker_groups[count.index],
|
var.worker_groups[count.index],
|
||||||
"ebs_optimized",
|
"ebs_optimized",
|
||||||
|
|||||||
@@ -262,7 +262,7 @@ resource "aws_launch_template" "workers_launch_template" {
|
|||||||
local.workers_group_defaults["key_name"],
|
local.workers_group_defaults["key_name"],
|
||||||
)
|
)
|
||||||
user_data = base64encode(
|
user_data = base64encode(
|
||||||
local.launch_template_userdata[count.index],
|
data.template_file.launch_template_userdata.*.rendered[count.index],
|
||||||
)
|
)
|
||||||
|
|
||||||
ebs_optimized = lookup(
|
ebs_optimized = lookup(
|
||||||
|
|||||||
Reference in New Issue
Block a user