Merge pull request #2 from a-devops/internal/devops-3874-update-module

devops-3874 update module

Author: avbuben

README.md

@@ -91,11 +91,10 @@ module "kubernetes" {
 | kms\_provider\_key\_id           | KMS key ID.                                                                                                                                                                                                                                                                                                                                                       | `any`                                                                           | `null`     |    no    |
 | labels                           | A set of key/value label pairs to assign to the Kubernetes cluster.                                                                                                                                                                                                                                                                                               | `map(string)`                                                                   | `{}`       |    no    |
 | master\_auto\_upgrade            | Boolean flag that specifies if master can be upgraded automatically.                                                                                                                                                                                                                                                                                              | `bool`                                                                          | `true`     |    no    |
-| master\_locations                | List of locations where cluster will be created. If list contains only one<br>location, will be created zonal cluster, if more than one -- regional.                                                                                                                                                                                                              | <pre>list(object({<br>  zone = string<br>  subnet_id = string<br>}))</pre>      | n/a        |   yes    |
+| master\_locations                | List of locations where cluster will be created.                                                                                                                                                                                                              | <pre>list(object({<br>  zone = string<br>  subnet_id = string<br>}))</pre>      | n/a        |   yes    |
 | master\_maintenance\_windows     | List of structures that specifies maintenance windows, when auto update for master is allowed.                                                                                                                                                                                                                                                                    | `list(map(string))`                                                             | `[]`       |    no    |
 | master\_public\_ip               | Boolean flag. When true, Kubernetes master will have visible ipv4 address.                                                                                                                                                                                                                                                                                        | `bool`                                                                          | `true`     |    no    |
 | master\_security\_group\_ids     | List of security group IDs to which the Kubernetes cluster belongs.                                                                                                                                                                                                                                                                                               | `set(string)`                                                                   | `null`     |    no    |
-| master\_region                   | Name of region where cluster will be created. Required for regional cluster,<br>not used for zonal cluster.                                                                                                                                                                                                                                                       | `string`                                                                        | `null`     |    no    |
 | master\_version                  | Version of Kubernetes that will be used for master.                                                                                                                                                                                                                                                                                                               | `string`                                                                        | `null`     |    no    |
 | name                             | Name of a specific Kubernetes cluster.                                                                                                                                                                                                                                                                                                                            | `string`                                                                        | `null`     |    no    |
 | network\_id                      | The ID of the cluster network.                                                                                                                                                                                                                                                                                                                                    | `string`                                                                        | n/a        |   yes    |

examples/regional_cluster/main.tf

@@ -21,11 +21,10 @@ data "yandex_client_config" "client" {}
 module "kubernetes" {
   source = "sport24ru/managed-kubernetes/yandex"
 
-  name       = "regional-cluster"
+  name       = "example-cluster"
   folder_id  = data.yandex_client_config.client.folder_id
   network_id = yandex_vpc_network.kubernetes.id
 
-  master_region = "ru-central1"
   master_locations = [for subnet in yandex_vpc_subnet.kubernetes : {
     subnet_id = subnet.id
     zone      = subnet.zone

main.tf

@@ -1,9 +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
@@ -96,29 +91,11 @@ 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"]
-          }
-        }
+        subnet_id = master_location.value["subnet_id"]
+        zone      = master_location.value["zone"]
       }
     }
 

variables.tf

@@ -180,21 +180,9 @@ variable "master_security_group_ids" {
   default = null
 }
 
-variable "master_region" {
-  description = <<-EOF
-  Name of region where cluster will be created. Required for regional cluster,
-  not used for zonal cluster.
-  EOF
-
-  type = string
-
-  default = null
-}
-
 variable "master_locations" {
   description = <<-EOF
-  List of locations where cluster will be created. If list contains only one
-  location, will be created zonal cluster, if more than one -- regional.
+  List of locations where cluster will be created.
   EOF
 
   type = list(object({