Skip to content

Commit

Permalink
improvement: Remove dependency on external template provider (#854)
Browse files Browse the repository at this point in the history 
* Remove template_file for generating kubeconfig

Push logic from terraform down to the template. Makes the formatting
slightly easier to follow

* Remove template_file for generating userdata

Updates to the eks_cluster now do not trigger recreation of launch
configurations

* Remove template_file for LT userdata

* Remove template dependency
  • Loading branch information
@dpiddockcmp
dpiddockcmp authored May 6, 2020
1 parent 25ebaab commit b183b97
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 136 deletions.
2 changes: 0 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
| local | >= 1.2 |
| null | >= 2.1 |
| random | >= 2.1 |
| template | >= 2.1 |

## Providers

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

## Inputs

Expand Down
214 changes: 90 additions & 124 deletions data.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,138 +66,104 @@ data "aws_iam_policy_document" "cluster_assume_role_policy" {
}
}

data "template_file" "kubeconfig" {
count = var.create_eks ? 1 : 0
template = file("${path.module}/templates/kubeconfig.tpl")

vars = {
kubeconfig_name = local.kubeconfig_name
endpoint = aws_eks_cluster.this[0].endpoint
cluster_auth_base64 = aws_eks_cluster.this[0].certificate_authority[0].data
aws_authenticator_command = var.kubeconfig_aws_authenticator_command
aws_authenticator_command_args = length(var.kubeconfig_aws_authenticator_command_args) > 0 ? " - ${join(
"\n - ",
var.kubeconfig_aws_authenticator_command_args,
)}" : " - ${join(
"\n - ",
formatlist("\"%s\"", ["token", "-i", aws_eks_cluster.this[0].name]),
)}"
aws_authenticator_additional_args = length(var.kubeconfig_aws_authenticator_additional_args) > 0 ? " - ${join(
"\n - ",
var.kubeconfig_aws_authenticator_additional_args,
)}" : ""
aws_authenticator_env_variables = length(var.kubeconfig_aws_authenticator_env_variables) > 0 ? " env:\n${join(
"\n",
data.template_file.aws_authenticator_env_variables.*.rendered,
)}" : ""
}
}

data "template_file" "aws_authenticator_env_variables" {
count = length(var.kubeconfig_aws_authenticator_env_variables)

template = <<EOF
- name: $${key}
value: $${value}
EOF


vars = {
value = values(var.kubeconfig_aws_authenticator_env_variables)[count.index]
key = keys(var.kubeconfig_aws_authenticator_env_variables)[count.index]
}
}

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"
locals {
kubeconfig = var.create_eks ? templatefile("${path.module}/templates/kubeconfig.tpl", {
kubeconfig_name = local.kubeconfig_name
endpoint = aws_eks_cluster.this[0].endpoint
cluster_auth_base64 = aws_eks_cluster.this[0].certificate_authority[0].data
aws_authenticator_command = var.kubeconfig_aws_authenticator_command
aws_authenticator_command_args = length(var.kubeconfig_aws_authenticator_command_args) > 0 ? var.kubeconfig_aws_authenticator_command_args : ["token", "-i", aws_eks_cluster.this[0].name]
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",

This comment has been minimized.

Sign in to view

Copy link
@mbarrien

mbarrien May 14, 2020

Contributor

This broke userdata_template_file. Prior to this PR userdata_template_file was the contents of the file, not the filename. Heavily broke our usage of this.

This comment has been minimized.

Sign in to view

Copy link
@dpiddockcmp

dpiddockcmp May 14, 2020

Author Contributor

Created as an Issue for easier visibility: #882

This comment has been minimized.

Sign in to view

Copy link
@mbarrien

mbarrien May 14, 2020

Contributor

I was actually writing the Github issue in the other window... needed time to extract all the bits of info for it. But I guess you already created the issue!
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
]

vars = merge({
platform = lookup(var.worker_groups[count.index], "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(
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"],
)
},
launch_template_userdata = [for worker in var.worker_groups_launch_template : templatefile(
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"
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"]
)
)
)

vars = merge({
platform = lookup(var.worker_groups_launch_template[count.index], "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(
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"]
)
)
) if var.create_eks
]
}

data "aws_iam_role" "custom_cluster_iam_role" {
Expand Down
2 changes: 1 addition & 1 deletion kubectl.tf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "local_file" "kubeconfig" {
count = var.write_kubeconfig && var.create_eks ? 1 : 0
content = data.template_file.kubeconfig[0].rendered
content = local.kubeconfig
filename = substr(var.config_output_path, -1, 1) == "/" ? "${var.config_output_path}kubeconfig_${var.cluster_name}" : var.config_output_path
}
6 changes: 3 additions & 3 deletions outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ output "cloudwatch_log_group_name" {

output "kubeconfig" {
description = "kubectl config file contents for this EKS cluster."
value = concat(data.template_file.kubeconfig[*].rendered, [""])[0]
value = local.kubeconfig
}

output "kubeconfig_filename" {
Expand Down Expand Up @@ -92,8 +92,8 @@ output "workers_asg_names" {
output "workers_user_data" {
description = "User data of worker groups"
value = concat(
data.template_file.userdata.*.rendered,
data.template_file.launch_template_userdata.*.rendered,
local.userdata,
local.launch_template_userdata,
)
}

Expand Down
16 changes: 13 additions & 3 deletions templates/kubeconfig.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ users:
apiVersion: client.authentication.k8s.io/v1alpha1
command: ${aws_authenticator_command}
args:
${aws_authenticator_command_args}
${aws_authenticator_additional_args}
${aws_authenticator_env_variables}
%{~ for i in aws_authenticator_command_args }
- "${i}"
%{~ endfor ~}
%{ for i in aws_authenticator_additional_args }
- ${i}
%{~ endfor ~}
%{ if length(aws_authenticator_env_variables) > 0 }
env:
%{~ for k, v in aws_authenticator_env_variables ~}
- name: ${k}
value: ${v}
%{~ endfor ~}
%{ endif ~}
1 change: 0 additions & 1 deletion versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ terraform {
aws = ">= 2.52.0"
local = ">= 1.2"
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(data.template_file.userdata.*.rendered[count.index])
user_data_base64 = base64encode(local.userdata[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(
data.template_file.launch_template_userdata.*.rendered[count.index],
local.launch_template_userdata[count.index],
)

ebs_optimized = lookup(
Expand Down

0 comments on commit b183b97

Please sign in to comment.