diff --git a/CHANGES.md b/CHANGES.md index 621d2176..334cf1d5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,8 +6,9 @@ Notable changes between versions. #### Google Cloud -* Add required variable `region` +* Add required variable `region` (e.g. "us-central1") * Change worker managed instance group to automatically span zones in a region +* Remove `controller_preemptible` optional variable (breaking) ## v1.8.2 diff --git a/docs/google-cloud.md b/docs/google-cloud.md index 33db1a92..86a8eae8 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -240,5 +240,5 @@ Check the list of valid [machine types](https://cloud.google.com/compute/docs/ma #### Preemption -Add `worker_premeptible = "true"` to allow worker nodes to be [preempted](https://cloud.google.com/compute/docs/instances/preemptible) at random, but pay [significantly](https://cloud.google.com/compute/pricing) less. Clusters tolerate stopping instances fairly well (reschedules pods, but cannot drain) and preemption provides a nice reward for running fault-tolerant cluster systems.` +Add `worker_preemeptible = "true"` to allow worker nodes to be [preempted](https://cloud.google.com/compute/docs/instances/preemptible) at random, but pay [significantly](https://cloud.google.com/compute/pricing) less. Clusters tolerate stopping instances fairly well (reschedules pods, but cannot drain) and preemption provides a nice reward for running fault-tolerant cluster systems.` diff --git a/google-cloud/container-linux/kubernetes/cluster.tf b/google-cloud/container-linux/kubernetes/cluster.tf index d38cc7b3..f7786355 100644 --- a/google-cloud/container-linux/kubernetes/cluster.tf +++ b/google-cloud/container-linux/kubernetes/cluster.tf @@ -11,7 +11,6 @@ module "controllers" { dns_zone_name = "${var.dns_zone_name}" machine_type = "${var.machine_type}" os_image = "${var.os_image}" - preemptible = "${var.controller_preemptible}" # configuration networking = "${var.networking}" diff --git a/google-cloud/container-linux/kubernetes/controllers/controllers.tf b/google-cloud/container-linux/kubernetes/controllers/controllers.tf index bb45e2cd..b2c6b6e1 100644 --- a/google-cloud/container-linux/kubernetes/controllers/controllers.tf +++ b/google-cloud/container-linux/kubernetes/controllers/controllers.tf @@ -45,11 +45,6 @@ resource "google_compute_instance_template" "controller" { user-data = "${data.ct_config.controller_ign.rendered}" } - scheduling { - automatic_restart = "${var.preemptible ? false : true}" - preemptible = "${var.preemptible}" - } - disk { auto_delete = true boot = true diff --git a/google-cloud/container-linux/kubernetes/controllers/variables.tf b/google-cloud/container-linux/kubernetes/controllers/variables.tf index 3244473c..14583afa 100644 --- a/google-cloud/container-linux/kubernetes/controllers/variables.tf +++ b/google-cloud/container-linux/kubernetes/controllers/variables.tf @@ -51,12 +51,6 @@ variable "disk_size" { description = "The size of the disk in gigabytes." } -variable "preemptible" { - type = "string" - default = "false" - description = "If enabled, Compute Engine will terminate instances randomly within 24 hours" -} - // configuration variable "networking" { diff --git a/google-cloud/container-linux/kubernetes/variables.tf b/google-cloud/container-linux/kubernetes/variables.tf index 73cb11bc..44040b73 100644 --- a/google-cloud/container-linux/kubernetes/variables.tf +++ b/google-cloud/container-linux/kubernetes/variables.tf @@ -51,12 +51,6 @@ variable "worker_count" { description = "Number of workers" } -variable "controller_preemptible" { - type = "string" - default = "false" - description = "If enabled, Compute Engine will terminate controllers randomly within 24 hours" -} - variable "worker_preemptible" { type = "string" default = "false"