From 05e9d08c687b4df9f76f8378d27a7b3808041ec2 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Fri, 17 Sep 2021 16:45:49 +0200
Subject: [PATCH] feat: Ability to specify cluster update timeout (#1588)

---
 README.md    | 1 +
 main.tf      | 1 +
 variables.tf | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 505a872ce1..5562a605f1 100644
--- a/README.md
+++ b/README.md
@@ -222,6 +222,7 @@ Apache 2 Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraf
 | <a name="input_cluster_security_group_id"></a> [cluster\_security\_group\_id](#input\_cluster\_security\_group\_id) | If provided, the EKS cluster will be attached to this security group. If not given, a security group will be created with necessary ingress/egress to work with the workers | `string` | `""` | no |
 | <a name="input_cluster_service_ipv4_cidr"></a> [cluster\_service\_ipv4\_cidr](#input\_cluster\_service\_ipv4\_cidr) | service ipv4 cidr for the kubernetes cluster | `string` | `null` | no |
 | <a name="input_cluster_tags"></a> [cluster\_tags](#input\_cluster\_tags) | A map of tags to add to just the eks resource. | `map(string)` | `{}` | no |
+| <a name="input_cluster_update_timeout"></a> [cluster\_update\_timeout](#input\_cluster\_update\_timeout) | Timeout value when updating the EKS cluster. | `string` | `"60m"` | no |
 | <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | Kubernetes version to use for the EKS cluster. | `string` | `null` | no |
 | <a name="input_create_eks"></a> [create\_eks](#input\_create\_eks) | Controls if EKS resources should be created (it affects almost all resources) | `bool` | `true` | no |
 | <a name="input_create_fargate_pod_execution_role"></a> [create\_fargate\_pod\_execution\_role](#input\_create\_fargate\_pod\_execution\_role) | Controls if the EKS Fargate pod execution IAM role should be created. | `bool` | `true` | no |
diff --git a/main.tf b/main.tf
index c5cc718e49..328f279dc7 100644
--- a/main.tf
+++ b/main.tf
@@ -47,6 +47,7 @@ resource "aws_eks_cluster" "this" {
   timeouts {
     create = var.cluster_create_timeout
     delete = var.cluster_delete_timeout
+    update = var.cluster_update_timeout
   }
 
   depends_on = [
diff --git a/variables.tf b/variables.tf
index 6454e6bad7..a5d9adefe3 100644
--- a/variables.tf
+++ b/variables.tf
@@ -234,6 +234,12 @@ variable "cluster_delete_timeout" {
   default     = "15m"
 }
 
+variable "cluster_update_timeout" {
+  description = "Timeout value when updating the EKS cluster."
+  type        = string
+  default     = "60m"
+}
+
 variable "cluster_create_security_group" {
   description = "Whether to create a security group for the cluster or attach the cluster to `cluster_security_group_id`."
   type        = bool