Remove controller_preemptible option on Google Cloud

* Controller preemption is not safe or covered in documentation. Delete
the option, the variable is a holdover from old experiments
* Note, worker_preemeptible is still a great feature that's supported
This commit is contained in:
Dalton Hubble 2017-11-04 11:48:50 -07:00
parent 251a14519f
commit 26a291aef4
6 changed files with 3 additions and 20 deletions

View File

@ -6,8 +6,9 @@ Notable changes between versions.
#### Google Cloud #### 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 * Change worker managed instance group to automatically span zones in a region
* Remove `controller_preemptible` optional variable (breaking)
## v1.8.2 ## v1.8.2

View File

@ -240,5 +240,5 @@ Check the list of valid [machine types](https://cloud.google.com/compute/docs/ma
#### Preemption #### 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.`

View File

@ -11,7 +11,6 @@ module "controllers" {
dns_zone_name = "${var.dns_zone_name}" dns_zone_name = "${var.dns_zone_name}"
machine_type = "${var.machine_type}" machine_type = "${var.machine_type}"
os_image = "${var.os_image}" os_image = "${var.os_image}"
preemptible = "${var.controller_preemptible}"
# configuration # configuration
networking = "${var.networking}" networking = "${var.networking}"

View File

@ -45,11 +45,6 @@ resource "google_compute_instance_template" "controller" {
user-data = "${data.ct_config.controller_ign.rendered}" user-data = "${data.ct_config.controller_ign.rendered}"
} }
scheduling {
automatic_restart = "${var.preemptible ? false : true}"
preemptible = "${var.preemptible}"
}
disk { disk {
auto_delete = true auto_delete = true
boot = true boot = true

View File

@ -51,12 +51,6 @@ variable "disk_size" {
description = "The size of the disk in gigabytes." 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 // configuration
variable "networking" { variable "networking" {

View File

@ -51,12 +51,6 @@ variable "worker_count" {
description = "Number of workers" 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" { variable "worker_preemptible" {
type = "string" type = "string"
default = "false" default = "false"