diff --git a/CHANGES.md b/CHANGES.md index 1e1974b7..99eaebc6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -25,6 +25,7 @@ Notable changes between versions. #### DigitalOcean +* Add Terraform v0.12 variables types ([#560](https://github.com/poseidon/typhoon/pull/560)) * Fix Terraform missing comma error ([#549](https://github.com/poseidon/typhoon/pull/549)) #### Google Cloud diff --git a/digital-ocean/container-linux/kubernetes/variables.tf b/digital-ocean/container-linux/kubernetes/variables.tf index fbd6df51..cf8a1ab1 100644 --- a/digital-ocean/container-linux/kubernetes/variables.tf +++ b/digital-ocean/container-linux/kubernetes/variables.tf @@ -18,33 +18,33 @@ variable "dns_zone" { # instances variable "controller_count" { - type = string - default = "1" + type = number description = "Number of controllers (i.e. masters)" + default = 1 } variable "worker_count" { - type = string - default = "1" + type = number description = "Number of workers" + default = 1 } variable "controller_type" { type = string - default = "s-2vcpu-2gb" description = "Droplet type for controllers (e.g. s-2vcpu-2gb, s-2vcpu-4gb, s-4vcpu-8gb)." + default = "s-2vcpu-2gb" } variable "worker_type" { type = string - default = "s-1vcpu-2gb" description = "Droplet type for workers (e.g. s-1vcpu-2gb, s-2vcpu-2gb)" + default = "s-1vcpu-2gb" } variable "image" { type = string - default = "coreos-stable" description = "Container Linux image for instances (e.g. coreos-stable)" + default = "coreos-stable" } variable "controller_clc_snippets" { @@ -67,48 +67,48 @@ variable "ssh_fingerprints" { } variable "asset_dir" { - description = "Path to a directory where generated assets should be placed (contains secrets)" type = string + description = "Absolute path to a directory where generated assets should be placed (contains secrets)" } variable "networking" { - description = "Choice of networking provider (flannel or calico)" type = string + description = "Choice of networking provider (flannel or calico)" default = "flannel" } variable "pod_cidr" { - description = "CIDR IPv4 range to assign Kubernetes pods" type = string + description = "CIDR IPv4 range to assign Kubernetes pods" default = "10.2.0.0/16" } variable "service_cidr" { + type = string description = <