Merge pull request #50 from garthy/zone_consistency_patch

jlamillan · web-flow · commit f47ed4b1145f · 2017-11-09T10:56:07.000-08:00
Make zone consistant accross k8s provisioners
diff --git a/instances/k8sworker/datasources.tf b/instances/k8sworker/datasources.tf
@@ -73,8 +73,8 @@ data "template_file" "kubelet-service" {
     master_lb   = "${var.master_lb}"
     k8s_ver     = "${var.k8s_ver}"
     domain_name = "${var.domain_name}"
-    region      = "${lower(var.region)}"
-    zone        = "${lower(replace(var.availability_domain,":","-"))}"
+    region      = "${var.region}"
+    zone        = "${element(split(":",var.availability_domain),1)}"
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ data "template_file" "kubelet-service" {`
`73`	`73`	`master_lb = "${var.master_lb}"`
`74`	`74`	`k8s_ver = "${var.k8s_ver}"`
`75`	`75`	`domain_name = "${var.domain_name}"`
`76`		`- region = "${lower(var.region)}"`
`77`		`- zone = "${lower(replace(var.availability_domain,":","-"))}"`
	`76`	`+ region = "${var.region}"`
	`77`	`+ zone = "${element(split(":",var.availability_domain),1)}"`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`