mirror of
https://github.com/ysoftdevs/terraform-aws-eks.git
synced 2026-05-01 12:54:29 +02:00
Upgrade to terraform 0.12 (#394)
* run terraform upgrade tool * fix post upgrade TODOs * use strict typing for variables * upgrade examples, point them at VPC module tf 0.12 PR * remove unnecessary `coalesce()` calls coalesce(lookup(map, key, ""), default) -> lookup(map, key, default) * Fix autoscaling_enabled broken (#1) * always set a value for tags, fix coalescelist calls * always set a value for these tags * fix tag value * fix tag value * default element available * added default value * added a general default without this default - TF is throwing an error when running a destroy * Fix CI * Change vpc module back to `terraform-aws-modules/vpc/aws` in example * Update CHANGELOG.md * Change type of variable `cluster_log_retention_in_days` to number * Remove `xx_count` variables * Actual lists instead of strings with commas * Remove `xx_count` variable from docs * Replace element with list indexing * Change variable `worker_group_tags` to a attribute of worker_group * Fix workers_launch_template_mixed tags * Change override_instance_type_x variables to list. * Update CHANGELOG.md
This commit is contained in:
刘相轩
181
data.tf
181
data.tf
@@ -1,4 +1,5 @@
|
||||
data "aws_region" "current" {}
|
||||
data "aws_region" "current" {
|
||||
}
|
||||
|
||||
data "aws_iam_policy_document" "workers_assume_role_policy" {
|
||||
statement {
|
||||
@@ -43,95 +44,169 @@ data "aws_iam_policy_document" "cluster_assume_role_policy" {
|
||||
}
|
||||
|
||||
data "template_file" "kubeconfig" {
|
||||
template = "${file("${path.module}/templates/kubeconfig.tpl")}"
|
||||
template = file("${path.module}/templates/kubeconfig.tpl")
|
||||
|
||||
vars {
|
||||
kubeconfig_name = "${local.kubeconfig_name}"
|
||||
endpoint = "${aws_eks_cluster.this.endpoint}"
|
||||
region = "${data.aws_region.current.name}"
|
||||
cluster_auth_base64 = "${aws_eks_cluster.this.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\"", list("token", "-i", aws_eks_cluster.this.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)}" : ""}"
|
||||
vars = {
|
||||
kubeconfig_name = local.kubeconfig_name
|
||||
endpoint = aws_eks_cluster.this.endpoint
|
||||
region = data.aws_region.current.name
|
||||
cluster_auth_base64 = aws_eks_cluster.this.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.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)}"
|
||||
count = length(var.kubeconfig_aws_authenticator_env_variables)
|
||||
|
||||
template = <<EOF
|
||||
- name: $${key}
|
||||
value: $${value}
|
||||
EOF
|
||||
|
||||
vars {
|
||||
value = "${element(values(var.kubeconfig_aws_authenticator_env_variables), count.index)}"
|
||||
key = "${element(keys(var.kubeconfig_aws_authenticator_env_variables), count.index)}"
|
||||
|
||||
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.worker_group_count}"
|
||||
template = "${file("${path.module}/templates/userdata.sh.tpl")}"
|
||||
count = local.worker_group_count
|
||||
template = file("${path.module}/templates/userdata.sh.tpl")
|
||||
|
||||
vars {
|
||||
cluster_name = "${aws_eks_cluster.this.name}"
|
||||
endpoint = "${aws_eks_cluster.this.endpoint}"
|
||||
cluster_auth_base64 = "${aws_eks_cluster.this.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"])}"
|
||||
vars = {
|
||||
cluster_name = aws_eks_cluster.this.name
|
||||
endpoint = aws_eks_cluster.this.endpoint
|
||||
cluster_auth_base64 = aws_eks_cluster.this.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"],
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
data "template_file" "launch_template_userdata" {
|
||||
count = "${var.worker_group_launch_template_count}"
|
||||
template = "${file("${path.module}/templates/userdata.sh.tpl")}"
|
||||
count = local.worker_group_launch_template_count
|
||||
template = file("${path.module}/templates/userdata.sh.tpl")
|
||||
|
||||
vars {
|
||||
cluster_name = "${aws_eks_cluster.this.name}"
|
||||
endpoint = "${aws_eks_cluster.this.endpoint}"
|
||||
cluster_auth_base64 = "${aws_eks_cluster.this.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"])}"
|
||||
vars = {
|
||||
cluster_name = aws_eks_cluster.this.name
|
||||
endpoint = aws_eks_cluster.this.endpoint
|
||||
cluster_auth_base64 = aws_eks_cluster.this.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"],
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
data "template_file" "workers_launch_template_mixed" {
|
||||
count = "${var.worker_group_launch_template_mixed_count}"
|
||||
template = "${file("${path.module}/templates/userdata.sh.tpl")}"
|
||||
count = local.worker_group_launch_template_mixed_count
|
||||
template = file("${path.module}/templates/userdata.sh.tpl")
|
||||
|
||||
vars {
|
||||
cluster_name = "${aws_eks_cluster.this.name}"
|
||||
endpoint = "${aws_eks_cluster.this.endpoint}"
|
||||
cluster_auth_base64 = "${aws_eks_cluster.this.certificate_authority.0.data}"
|
||||
pre_userdata = "${lookup(var.worker_groups_launch_template_mixed[count.index], "pre_userdata", local.workers_group_defaults["pre_userdata"])}"
|
||||
additional_userdata = "${lookup(var.worker_groups_launch_template_mixed[count.index], "additional_userdata", local.workers_group_defaults["additional_userdata"])}"
|
||||
bootstrap_extra_args = "${lookup(var.worker_groups_launch_template_mixed[count.index], "bootstrap_extra_args", local.workers_group_defaults["bootstrap_extra_args"])}"
|
||||
kubelet_extra_args = "${lookup(var.worker_groups_launch_template_mixed[count.index], "kubelet_extra_args", local.workers_group_defaults["kubelet_extra_args"])}"
|
||||
vars = {
|
||||
cluster_name = aws_eks_cluster.this.name
|
||||
endpoint = aws_eks_cluster.this.endpoint
|
||||
cluster_auth_base64 = aws_eks_cluster.this.certificate_authority[0].data
|
||||
pre_userdata = lookup(
|
||||
var.worker_groups_launch_template_mixed[count.index],
|
||||
"pre_userdata",
|
||||
local.workers_group_defaults["pre_userdata"],
|
||||
)
|
||||
additional_userdata = lookup(
|
||||
var.worker_groups_launch_template_mixed[count.index],
|
||||
"additional_userdata",
|
||||
local.workers_group_defaults["additional_userdata"],
|
||||
)
|
||||
bootstrap_extra_args = lookup(
|
||||
var.worker_groups_launch_template_mixed[count.index],
|
||||
"bootstrap_extra_args",
|
||||
local.workers_group_defaults["bootstrap_extra_args"],
|
||||
)
|
||||
kubelet_extra_args = lookup(
|
||||
var.worker_groups_launch_template_mixed[count.index],
|
||||
"kubelet_extra_args",
|
||||
local.workers_group_defaults["kubelet_extra_args"],
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
data "aws_iam_role" "custom_cluster_iam_role" {
|
||||
count = "${var.manage_cluster_iam_resources ? 0 : 1}"
|
||||
name = "${var.cluster_iam_role_name}"
|
||||
count = var.manage_cluster_iam_resources ? 0 : 1
|
||||
name = var.cluster_iam_role_name
|
||||
}
|
||||
|
||||
data "aws_iam_instance_profile" "custom_worker_group_iam_instance_profile" {
|
||||
count = "${var.manage_worker_iam_resources ? 0 : var.worker_group_count}"
|
||||
name = "${lookup(var.worker_groups[count.index], "iam_instance_profile_name", local.workers_group_defaults["iam_instance_profile_name"])}"
|
||||
count = var.manage_worker_iam_resources ? 0 : local.worker_group_count
|
||||
name = lookup(
|
||||
var.worker_groups[count.index],
|
||||
"iam_instance_profile_name",
|
||||
local.workers_group_defaults["iam_instance_profile_name"],
|
||||
)
|
||||
}
|
||||
|
||||
data "aws_iam_instance_profile" "custom_worker_group_launch_template_iam_instance_profile" {
|
||||
count = "${var.manage_worker_iam_resources ? 0 : var.worker_group_launch_template_count}"
|
||||
name = "${lookup(var.worker_groups_launch_template[count.index], "iam_instance_profile_name", local.workers_group_defaults["iam_instance_profile_name"])}"
|
||||
count = var.manage_worker_iam_resources ? 0 : local.worker_group_launch_template_count
|
||||
name = lookup(
|
||||
var.worker_groups_launch_template[count.index],
|
||||
"iam_instance_profile_name",
|
||||
local.workers_group_defaults["iam_instance_profile_name"],
|
||||
)
|
||||
}
|
||||
|
||||
data "aws_iam_instance_profile" "custom_worker_group_launch_template_mixed_iam_instance_profile" {
|
||||
count = "${var.manage_worker_iam_resources ? 0 : var.worker_group_launch_template_mixed_count}"
|
||||
name = "${lookup(var.worker_groups_launch_template_mixed[count.index], "iam_instance_profile_name", local.workers_group_defaults["iam_instance_profile_name"])}"
|
||||
count = var.manage_worker_iam_resources ? 0 : local.worker_group_launch_template_mixed_count
|
||||
name = lookup(
|
||||
var.worker_groups_launch_template_mixed[count.index],
|
||||
"iam_instance_profile_name",
|
||||
local.workers_group_defaults["iam_instance_profile_name"],
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user