Merge pull request #8 from zorgzerg/master

Use 'master_location' istead 'zonal' and 'regional' params in 'master…
sport24ru · Jan 31, 2024 · 9f47954 · 9f47954
2 parents 6000b87 + bdbf007
commit 9f47954
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.3.0 (January 18, 2024)
+
+NOTES:
+
+* Change attributes of cluster: use `master_location` instead `zonal` and `regional`
+* Ready for migration from C to D allocataion zone
+* Required provider yandex >= 0.105.0
+
 ## 2.2.1 (August 17, 2022)
 
 BUG FIXES:
@@ -24,7 +32,7 @@ NOTES:
 
 * Required provider yandex >= 0.70
 * Avoided usage of deprecated attribute
-  `yandex_kubernetes_node_group.instance_template.nat` (fixed #3) 
+  `yandex_kubernetes_node_group.instance_template.nat` (fixed #3)
 
 ## 2.1.0 (August 25, 2021)
 
@@ -35,4 +43,4 @@ ENHANCEMENTS:
 NOTES:
 
 * Avoided warning about deprecated subnet definition (fixed #2).
-* Required provider yandex >= 0.52
+* Required provider yandex >= 0.52
diff --git a/README.md b/README.md
@@ -164,10 +164,10 @@ value is a map of node group attributes.
 | Name      | Version    |
 |-----------|------------|
 | terraform | > = 0.13.0 |
-| yandex    | > = 0.70   |
+| yandex    | > = 0.105.0   |
 
 ## Providers
 
 | Name   | Version    |
 |--------|------------|
-| yandex | > = 0.70   |
+| yandex | > = 0.105.0   |
diff --git a/main.tf b/main.tf
@@ -1,11 +1,4 @@
 locals {
-  master_regions = length(var.master_locations) > 1 ? [{
-    region    = var.master_region
-    locations = var.master_locations
-  }] : []
-
-  master_locations = length(var.master_locations) > 1 ? [] : var.master_locations
-
   service_account_name = var.service_account_id == null ? var.service_account_name : null
 
   common_ssh_keys_metadata = length(var.node_groups_default_ssh_keys) > 0 ? {
@@ -92,29 +85,12 @@ resource "yandex_kubernetes_cluster" "cluster" {
     public_ip          = var.master_public_ip
     security_group_ids = var.master_security_group_ids
 
-    dynamic "zonal" {
-      for_each = local.master_locations
-
-      content {
-        zone      = zonal.value["zone"]
-        subnet_id = zonal.value["subnet_id"]
-      }
-    }
-
-    dynamic "regional" {
-      for_each = local.master_regions
+    dynamic "master_location" {
+      for_each = var.master_locations
 
       content {
-        region = regional.value["region"]
-
-        dynamic "location" {
-          for_each = regional.value["locations"]
-
-          content {
-            zone      = location.value["zone"]
-            subnet_id = location.value["subnet_id"]
-          }
-        }
+        zone      = master_location.value["zone"]
+        subnet_id = master_location.value["subnet_id"]
       }
     }
 

diff --git a/versions.tf b/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     yandex = {
       source  = "yandex-cloud/yandex"
-      version = ">= 0.70"
+      version = ">= 0.105.0"
     }
   }
 }