Merge pull request #64 from Charliekenney23/tf-1.0-support

0xch4z · web-flow · commit 2ceb02d4241c · 2021-08-06T13:29:51.000-04:00
add support for terraform 1.0.0
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/modules/instances/outputs.tf b/modules/instances/outputs.tf
@@ -2,14 +2,14 @@
 output "public_ip_address" {
   depends_on  = [linode_instance.instance[0]]
   description = "Public IP Address of the first instance in the group"
-  value       = element(concat(linode_instance.instance.*.ip_address, list("")), 0)
+  value       = element(concat(linode_instance.instance.*.ip_address, [""]), 0)
 }
 
 // todo: this doesnt make sense in ha  -- return all?
 output "private_ip_address" {
   description = "Private IP Address of the first instance in the group"
   depends_on  = [linode_instance.instance[0]]
-  value       = element(concat(linode_instance.instance.*.private_ip_address, list("")), 0)
+  value       = element(concat(linode_instance.instance.*.private_ip_address, [""]), 0)
 }
 
 output "nodes_public_ip" {
diff --git a/modules/masters/outputs.tf b/modules/masters/outputs.tf
@@ -15,7 +15,7 @@ locals {
     command = ""
   }
 
-  kubeadm_join_results = concat(data.external.kubeadm_join.*.result, list(local.result))
+  kubeadm_join_results = concat(data.external.kubeadm_join.*.result, [local.result])
   kubeadm_join_command = lookup(local.kubeadm_join_results["0"], "command", "")
 }
 
diff --git a/terraform.tf b/terraform.tf
@@ -1,3 +1,3 @@
 terraform {
-  required_version = "~> 0.13.0"
+  required_version = "~> 1.0.0"
 }
diff --git a/versions.tf b/versions.tf
@@ -13,5 +13,4 @@ terraform {
       version = "~> 3.0.0"
     }
   }
-  required_version = ">= 0.13"
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ locals {`
`15`	`15`	`command = ""`
`16`	`16`	`}`
`17`	`17`
`18`		`- kubeadm_join_results = concat(data.external.kubeadm_join.*.result, list(local.result))`
	`18`	`+ kubeadm_join_results = concat(data.external.kubeadm_join.*.result, [local.result])`
`19`	`19`	`kubeadm_join_command = lookup(local.kubeadm_join_results["0"], "command", "")`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = "~> 0.13.0"`
	`2`	`+ required_version = "~> 1.0.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,4 @@ terraform {`
`13`	`13`	`version = "~> 3.0.0"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`		`- required_version = ">= 0.13"`
`17`	`16`	`}`