update to terraform 0.13

ExpediaGroup · Oct 15, 2024 · 641dd70 · 641dd70
1 parent f7a0275
commit 641dd70
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/variables.tf b/variables.tf
@@ -397,8 +397,8 @@ variable "hms_ro_k8s_max_replica_count" {
 variable "hms_ro_k8s_rolling_update_strategy" {
   description = "Rolling update strategy settings for HMS RO including max_surge and max_unavailable"
   type = object({
-    max_surge       = optional(string)
-    max_unavailable = optional(string)
+    max_surge       = string
+    max_unavailable = string
   })
   default = {
     max_surge       = "25%"
@@ -409,8 +409,8 @@ variable "hms_ro_k8s_rolling_update_strategy" {
 variable "hms_rw_k8s_rolling_update_strategy" {
   description = "Rolling update strategy settings for HMS RW including max_surge and max_unavailable"
   type = object({
-    max_surge       = optional(string)
-    max_unavailable = optional(string)
+    max_surge       = string
+    max_unavailable = string
   })
   default = {
     max_surge       = "25%"
@@ -422,24 +422,28 @@ variable "hms_ro_k8s_pdb_settings" {
   description = "PDB settings for HMS RO including enable flag, maxUnavailable, and minAvailable."
   type = object({
     enabled         = bool
-    max_unavailable = optional(string)
-    min_available   = optional(string)
+    max_unavailable = string
+    min_available   = string
   })
   default = {
-    enabled = false
+    enabled         = false
+    max_unavailable = null
+    min_available   = null
   }
 }
 
 variable "hms_rw_k8s_pdb_settings" {
   description = "PDB settings for HMS RW including enable flag, maxUnavailable, and minAvailable."
   type = object({
     enabled         = bool
-    max_unavailable = optional(string)
-    min_available   = optional(string)
+    max_unavailable = string
+    min_available   = string
   })
   default = {
-    enabled = false
-  }
+    enabled         = false
+    max_unavailable = null
+    min_available   = null
+  }  
 }
 
 variable "hms_rw_node_affinity" {

diff --git a/version.tf b/version.tf
@@ -5,8 +5,7 @@
  */
 
 terraform {
-  experiments = [module_variable_optional_attrs]
-  required_version = ">= 0.15.0, < 1.0.0"
+  required_version = ">= 0.13.0"
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"