Skip to content

Commit

Permalink
fix: Revert removal of templates provider (#883)
Browse files Browse the repository at this point in the history 
Broke use case of passing in custom template content. Reverts most of the following PRs:
- #865
- #863 
- #854
  • Loading branch information
@dpiddockcmp
dpiddockcmp authored Jun 5, 2020
1 parent 05cd785 commit 7de18cd
Show file tree
Hide file tree
Showing 13 changed files with 123 additions and 92 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
| local | >= 1.4 |
| null | >= 2.1 |
| random | >= 2.1 |
| template | >= 2.1 |

## Providers

Expand All @@ -150,6 +151,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
| local | >= 1.4 |
| null | >= 2.1 |
| random | >= 2.1 |
| template | >= 2.1 |

## Inputs

Expand Down
92 changes: 92 additions & 0 deletions data.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
count = var.manage_cluster_iam_resources ? 0 : 1
name = var.cluster_iam_role_name
Expand Down
4 changes: 4 additions & 0 deletions examples/basic/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ provider "null" {
version = "~> 2.1"
}

provider "template" {
version = "~> 2.1"
}

data "aws_eks_cluster" "cluster" {
name = module.eks.cluster_id
}
Expand Down
4 changes: 4 additions & 0 deletions examples/irsa/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ provider "null" {
version = "~> 2.1"
}

provider "template" {
version = "~> 2.1"
}

data "aws_eks_cluster" "cluster" {
name = module.eks.cluster_id
}
Expand Down
4 changes: 4 additions & 0 deletions examples/launch_templates/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ provider "null" {
version = "~> 2.1"
}

provider "template" {
version = "~> 2.1"
}

data "aws_eks_cluster" "cluster" {
name = module.eks.cluster_id
}
Expand Down
4 changes: 4 additions & 0 deletions examples/managed_node_groups/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ provider "null" {
version = "~> 2.1"
}

provider "template" {
version = "~> 2.1"
}

data "aws_eks_cluster" "cluster" {
name = module.eks.cluster_id
}
Expand Down
4 changes: 4 additions & 0 deletions examples/secrets_encryption/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ provider "null" {
version = "~> 2.1"
}

provider "template" {
version = "~> 2.1"
}

data "aws_eks_cluster" "cluster" {
name = module.eks.cluster_id
}
Expand Down
4 changes: 4 additions & 0 deletions examples/spot_instances/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ provider "null" {
version = "~> 2.1"
}

provider "template" {
version = "~> 2.1"
}

data "aws_eks_cluster" "cluster" {
name = module.eks.cluster_id
}
Expand Down
88 changes: 0 additions & 88 deletions local.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,92 +147,4 @@ locals {
aws_authenticator_additional_args = var.kubeconfig_aws_authenticator_additional_args
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
]
}
4 changes: 2 additions & 2 deletions outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ output "workers_asg_names" {
output "workers_user_data" {
description = "User data of worker groups"
value = concat(
local.userdata,
local.launch_template_userdata,
data.template_file.userdata.*.rendered,
data.template_file.launch_template_userdata.*.rendered,
)
}

Expand Down
1 change: 1 addition & 0 deletions versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ terraform {
aws = ">= 2.52.0"
local = ">= 1.4"
null = ">= 2.1"
template = ">= 2.1"
random = ">= 2.1"
kubernetes = ">= 1.11.1"
}
Expand Down
2 changes: 1 addition & 1 deletion workers.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ resource "aws_launch_configuration" "workers" {
"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(
var.worker_groups[count.index],
"ebs_optimized",
Expand Down
2 changes: 1 addition & 1 deletion workers_launch_template.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ resource "aws_launch_template" "workers_launch_template" {
local.workers_group_defaults["key_name"],
)
user_data = base64encode(
local.launch_template_userdata[count.index],
data.template_file.launch_template_userdata.*.rendered[count.index],
)

ebs_optimized = lookup(
Expand Down

0 comments on commit 7de18cd

Please sign in to comment.