From 056bd8a059c2407c39455df67064884591a2e8a6 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 25 Aug 2017 00:14:02 -0700 Subject: [PATCH] google-cloud: Remove deprecated automatic_restart field * In terraform-provider-google v0.1.3, it is no longer neccessary to supply a (duplicated) value for the instance_template field automatic_restart * Previously this field was set to match the scheduling automatic_restart since the field defaulted to true and would cause plan to always show changes were needed --- README.md | 6 +++--- google-cloud/container-linux/controllers/controllers.tf | 3 --- google-cloud/container-linux/workers/workers.tf | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 00a0ebed..078526d3 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Typhoon provides a Terraform Module for each supported operating system and plat ## Docs * [https://typhoon.psdn.io](https://typhoon.psdn.io) -* [Getting Started](https://typhoon.psdn.io/getting-started/) +* [Concepts](https://typhoon.psdn.io/concepts/) * [Bare-Metal](https://typhoon.psdn.io/bare-metal/) * [Digital Ocean](https://typhoon.psdn.io/digital-ocean/) * [Google-Cloud](https://typhoon.psdn.io/google-cloud/) @@ -44,12 +44,12 @@ module "yavin-cluster" { zone = "us-central1-c" dns_zone = "example.com" dns_zone_name = "example-zone" - os_image = "coreos-stable-1409-7-0-v20170719" + os_image = "coreos-stable-1465-6-0-v20170817" # Cluster cluster_name = "yavin" controller_count = 1 - worker_count = 3 + worker_count = 2 ssh_authorized_key = "${var.ssh_authorized_key}" # output assets dir diff --git a/google-cloud/container-linux/controllers/controllers.tf b/google-cloud/container-linux/controllers/controllers.tf index 3c353fea..445b1d5d 100644 --- a/google-cloud/container-linux/controllers/controllers.tf +++ b/google-cloud/container-linux/controllers/controllers.tf @@ -50,9 +50,6 @@ resource "google_compute_instance_template" "controller" { preemptible = "${var.preemptible}" } - # QUIRK: Undocumented field defaults to true if not set - automatic_restart = "${var.preemptible ? false : true}" - disk { auto_delete = true boot = true diff --git a/google-cloud/container-linux/workers/workers.tf b/google-cloud/container-linux/workers/workers.tf index 148bb69f..f72a22bb 100644 --- a/google-cloud/container-linux/workers/workers.tf +++ b/google-cloud/container-linux/workers/workers.tf @@ -50,9 +50,6 @@ resource "google_compute_instance_template" "worker" { preemptible = "${var.preemptible}" } - # QUIRK: Undocumented field defaults to true if not set - automatic_restart = "${var.preemptible ? false : true}" - disk { auto_delete = true boot = true