Merge pull request #186 from scalar-labs/fix-location-region-for-k8s

fix location to region for k8s
scalar-labs · Aug 18, 2020 · 86f96f8 · 86f96f8
2 parents aef32f7 + ec042a1
commit 86f96f8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/examples/azure/kubernetes/locals.tf b/examples/azure/kubernetes/locals.tf
@@ -1,10 +1,10 @@
 locals {
   network = {
-    name     = data.terraform_remote_state.network.outputs.network_name
-    dns      = data.terraform_remote_state.network.outputs.dns_zone_id
-    id       = data.terraform_remote_state.network.outputs.network_id
-    location = data.terraform_remote_state.network.outputs.location
-    cidr     = data.terraform_remote_state.network.outputs.network_cidr
+    name   = data.terraform_remote_state.network.outputs.network_name
+    dns    = data.terraform_remote_state.network.outputs.dns_zone_id
+    id     = data.terraform_remote_state.network.outputs.network_id
+    region = data.terraform_remote_state.network.outputs.region
+    cidr   = data.terraform_remote_state.network.outputs.network_cidr
 
     bastion_ip = data.terraform_remote_state.network.outputs.bastion_ip
     user_name  = data.terraform_remote_state.network.outputs.user_name

diff --git a/modules/azure/kubernetes/kubernetes.tf b/modules/azure/kubernetes/kubernetes.tf
@@ -82,7 +82,7 @@ resource "azurerm_role_assignment" "sp_role_assignment" {
 resource "azurerm_kubernetes_cluster" "aks_cluster" {
   name                    = local.kubernetes_cluster.name
   resource_group_name     = local.kubernetes_cluster.resource_group_name
-  location                = local.kubernetes_cluster.location
+  location                = local.kubernetes_cluster.region
   dns_prefix              = local.kubernetes_cluster.dns_prefix
   kubernetes_version      = local.kubernetes_cluster.kubernetes_version
   node_resource_group     = "${local.kubernetes_cluster.resource_group_name}_MC"

diff --git a/modules/azure/kubernetes/locals.tf b/modules/azure/kubernetes/locals.tf
@@ -19,7 +19,7 @@ locals {
   kubernetes_cluster_default = {
     name                      = "scalar-kubernetes"
     resource_group_name       = var.network.name
-    location                  = var.network.location
+    region                    = var.network.region
     dns_prefix                = "scalar-kubernetes"
     kubernetes_version        = "1.16.13"
     admin_username            = "azureuser"

diff --git a/test/modules/azuredeploy/kubernetes/locals.tf b/test/modules/azuredeploy/kubernetes/locals.tf
@@ -1,10 +1,10 @@
 locals {
   network = {
-    name     = data.terraform_remote_state.network.outputs.network_name
-    dns      = data.terraform_remote_state.network.outputs.dns_zone_id
-    id       = data.terraform_remote_state.network.outputs.network_id
-    location = data.terraform_remote_state.network.outputs.location
-    cidr     = data.terraform_remote_state.network.outputs.network_cidr
+    name   = data.terraform_remote_state.network.outputs.network_name
+    dns    = data.terraform_remote_state.network.outputs.dns_zone_id
+    id     = data.terraform_remote_state.network.outputs.network_id
+    region = data.terraform_remote_state.network.outputs.region
+    cidr   = data.terraform_remote_state.network.outputs.network_cidr
 
     bastion_ip = data.terraform_remote_state.network.outputs.bastion_ip
     user_name  = data.terraform_remote_state.network.outputs.user_name

diff --git a/test/modules/azuredeploy/kubernetes/locals.tf.dummy b/test/modules/azuredeploy/kubernetes/locals.tf.dummy
@@ -1,10 +1,10 @@
 locals {
   network = {
-    name     = "example-k8s-azure"
-    dns      = "internal.scalar-labs.com"
-    id       = "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/example-azure-6qkpmqe/providers/Microsoft.Network/virtualNetworks/example-azure-6qkpmqe"
-    location = "japaneast"
-    cidr     = "10.42.0.0/16"
+    name   = "example-k8s-azure"
+    dns    = "internal.scalar-labs.com"
+    id     = "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/example-azure-6qkpmqe/providers/Microsoft.Network/virtualNetworks/example-azure-6qkpmqe"
+    region = "japaneast"
+    cidr   = "10.42.0.0/16"
 
     bastion_ip = "bastion-example-azure-6qkpmqe.japaneast.cloudapp.azure.com"
     user_name  = "centos"