FEATURE: instance refresh flag (#181)

- Add a flag to enable / disable ASG instance refresh
getamis · Dec 6, 2023 · 2628d34 · 2628d34
1 parent 5007ca9
commit 2628d34
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 10 deletions.
diff --git a/examples/aws-eks-distro/main.tf b/examples/aws-eks-distro/main.tf
@@ -116,6 +116,7 @@ module "master" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 
@@ -170,6 +171,7 @@ module "worker_on_demand" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 
@@ -223,6 +225,7 @@ module "worker_spot" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 

diff --git a/examples/iam-auth-and-irsa/k8s-cluster/main.tf b/examples/iam-auth-and-irsa/k8s-cluster/main.tf
@@ -92,6 +92,7 @@ module "master" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 

diff --git a/examples/kubernetes-cluster-aws-vpc/main.tf b/examples/kubernetes-cluster-aws-vpc/main.tf
@@ -71,6 +71,7 @@ module "master" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 
@@ -138,6 +139,7 @@ module "worker_on_demand" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 
@@ -207,6 +209,7 @@ module "worker_spot" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 

diff --git a/examples/kubernetes-cluster-cilium-vxlan/main.tf b/examples/kubernetes-cluster-cilium-vxlan/main.tf
@@ -71,6 +71,7 @@ module "master" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 
@@ -136,6 +137,7 @@ module "worker_on_demand" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 
@@ -204,6 +206,7 @@ module "worker_spot" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 

diff --git a/modules/aws/elastikube/variables.tf b/modules/aws/elastikube/variables.tf
@@ -293,6 +293,7 @@ variable "master_instance_config" {
 
     suspended_processes = list(string)
 
+    instance_refresh       = bool
     instance_warmup        = number
     min_healthy_percentage = number
 
@@ -317,6 +318,7 @@ variable "master_instance_config" {
 
     suspended_processes = []
 
+    instance_refresh       = false
     instance_warmup        = 30
     min_healthy_percentage = 100
 

diff --git a/modules/aws/kube-master/main.tf b/modules/aws/kube-master/main.tf
@@ -32,11 +32,14 @@ resource "aws_autoscaling_group" "master" {
 
   suspended_processes = var.instance_config["suspended_processes"]
 
-  instance_refresh {
-    strategy = "Rolling"
-    preferences {
-      instance_warmup        = var.instance_config["instance_warmup"]
-      min_healthy_percentage = var.instance_config["min_healthy_percentage"]
+  dynamic "instance_refresh" {
+    for_each = var.instance_config["instance_refresh"] ? [1] : []
+    content {
+      strategy = "Rolling"
+      preferences {
+        instance_warmup        = var.instance_config["instance_warmup"]
+        min_healthy_percentage = var.instance_config["min_healthy_percentage"]
+      }
     }
   }
 

diff --git a/modules/aws/kube-master/variables.tf b/modules/aws/kube-master/variables.tf
@@ -290,6 +290,7 @@ variable "instance_config" {
 
     suspended_processes = list(string)
 
+    instance_refresh       = bool
     instance_warmup        = number
     min_healthy_percentage = number
 

diff --git a/modules/aws/kube-worker/main.tf b/modules/aws/kube-worker/main.tf
@@ -33,11 +33,14 @@ resource "aws_autoscaling_group" "worker" {
 
   suspended_processes = var.instance_config["suspended_processes"]
 
-  instance_refresh {
-    strategy = "Rolling"
-    preferences {
-      instance_warmup        = var.instance_config["instance_warmup"]
-      min_healthy_percentage = var.instance_config["min_healthy_percentage"]
+  dynamic "instance_refresh" {
+    for_each = var.instance_config["instance_refresh"] ? [1] : []
+    content {
+      strategy = "Rolling"
+      preferences {
+        instance_warmup        = var.instance_config["instance_warmup"]
+        min_healthy_percentage = var.instance_config["min_healthy_percentage"]
+      }
     }
   }
 

diff --git a/modules/aws/kube-worker/variables.tf b/modules/aws/kube-worker/variables.tf
@@ -149,6 +149,7 @@ variable "instance_config" {
 
     suspended_processes = list(string)
 
+    instance_refresh       = bool
     instance_warmup        = number
     min_healthy_percentage = number