mirror of
https://github.com/terraform-aws-modules/terraform-aws-eks.git
synced 2025-09-09 19:32:58 +08:00
Add destroy time flag (#580)
* Add destroy-time flag
* Update changelog
Fix cluster count
* Fix cluster count
* Fix docs
* Fix outputs
* Fix unsupported attribute on cluster_certificate_authority_data output
Co-Authored-By: Daniel Piddock <33028589+dpiddockcmp@users.noreply.github.com>
* Remove unnecessary flatten from cluster_endpoint output
Co-Authored-By: Daniel Piddock <33028589+dpiddockcmp@users.noreply.github.com>
* Improve description of var.enabled
* Fix errors manifesting when used on an existing-cluster
* Update README.md
* Renamed destroy-time flag
* Revert removal of changelog addition entry
* Update flag name in readme
* Update flag variable name
* Update cluster referencing for consistency
* Update flag name to `create_eks`
* Fixed incorrect count-based reference to aws_eks_cluster.this (there's only one)
* Replaced all incorrect aws_eks_cluster.this[count.index] references (there will be just one, so using '[0]').
* Changelog update, explicitly mentioning flag
* Fixed interpolation deprecation warning
* Fixed outputs to support conditional cluster
* Applied create_eks to aws_auth.tf
* Removed unused variable. Updated Changelog. Formatting.
* Fixed references to aws_eks_cluster.this[0] that would raise errors when setting create_eks to false whilst having launch templates or launch configurations configured.
* Readme and example updates.
* Revert "Readme and example updates."
This reverts commit 18a0746355.
* Updated readme section of conditionally creation with provider example.
* Added conditions to node_groups.
* Fixed reversed map_roles check
* Update aws_auth.tf
Revert this due to https://github.com/terraform-aws-modules/terraform-aws-eks/pull/611
This commit is contained in:
committed by
Max Williams
parent
7c2c4a6aa5
commit
124ea7c151
@@ -66,19 +66,20 @@ 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.endpoint
|
||||
cluster_auth_base64 = aws_eks_cluster.this.certificate_authority[0].data
|
||||
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.name]),
|
||||
formatlist("\"%s\"", ["token", "-i", aws_eks_cluster.this[0].name]),
|
||||
)}"
|
||||
aws_authenticator_additional_args = length(var.kubeconfig_aws_authenticator_additional_args) > 0 ? " - ${join(
|
||||
"\n - ",
|
||||
@@ -107,7 +108,7 @@ EOF
|
||||
}
|
||||
|
||||
data "template_file" "userdata" {
|
||||
count = local.worker_group_count
|
||||
count = var.create_eks ? local.worker_group_count : 0
|
||||
template = lookup(
|
||||
var.worker_groups[count.index],
|
||||
"userdata_template_file",
|
||||
@@ -120,9 +121,9 @@ data "template_file" "userdata" {
|
||||
|
||||
vars = merge({
|
||||
platform = lookup(var.worker_groups[count.index], "platform", local.workers_group_defaults["platform"])
|
||||
cluster_name = aws_eks_cluster.this.name
|
||||
endpoint = aws_eks_cluster.this.endpoint
|
||||
cluster_auth_base64 = aws_eks_cluster.this.certificate_authority[0].data
|
||||
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",
|
||||
@@ -153,7 +154,7 @@ data "template_file" "userdata" {
|
||||
}
|
||||
|
||||
data "template_file" "launch_template_userdata" {
|
||||
count = local.worker_group_launch_template_count
|
||||
count = var.create_eks ? local.worker_group_launch_template_count : 0
|
||||
template = lookup(
|
||||
var.worker_groups_launch_template[count.index],
|
||||
"userdata_template_file",
|
||||
@@ -166,9 +167,9 @@ data "template_file" "launch_template_userdata" {
|
||||
|
||||
vars = merge({
|
||||
platform = lookup(var.worker_groups_launch_template[count.index], "platform", local.workers_group_defaults["platform"])
|
||||
cluster_name = aws_eks_cluster.this.name
|
||||
endpoint = aws_eks_cluster.this.endpoint
|
||||
cluster_auth_base64 = aws_eks_cluster.this.certificate_authority[0].data
|
||||
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",
|
||||
|
||||
Reference in New Issue
Block a user