From a48dd9ebd81d47bff86ece70832ecad50abbb976 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 4 Nov 2017 12:48:01 -0700 Subject: [PATCH] Require google provider version ~> 1.1 * Require google provider plugin 1.1 or higher which includes fix: https://github.com/terraform-providers/terraform-provider-google/issues/574 * Remove workaround which statically set the persistent disk name * Original reasons for workaround in a97df839 or GH #34 --- .../container-linux/kubernetes/controllers/controllers.tf | 4 ---- google-cloud/container-linux/kubernetes/require.tf | 2 +- google-cloud/container-linux/kubernetes/workers/workers.tf | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/google-cloud/container-linux/kubernetes/controllers/controllers.tf b/google-cloud/container-linux/kubernetes/controllers/controllers.tf index b2c6b6e1..f358a028 100644 --- a/google-cloud/container-linux/kubernetes/controllers/controllers.tf +++ b/google-cloud/container-linux/kubernetes/controllers/controllers.tf @@ -50,10 +50,6 @@ resource "google_compute_instance_template" "controller" { boot = true source_image = "${var.os_image}" disk_size_gb = "${var.disk_size}" - - // Set explicit name to match the new default name set by the API. - // https://github.com/terraform-providers/terraform-provider-google/issues/574 - device_name = "persistent-disk-0" } network_interface { diff --git a/google-cloud/container-linux/kubernetes/require.tf b/google-cloud/container-linux/kubernetes/require.tf index f2a8cbd7..fd9ac6bf 100644 --- a/google-cloud/container-linux/kubernetes/require.tf +++ b/google-cloud/container-linux/kubernetes/require.tf @@ -5,7 +5,7 @@ terraform { } provider "google" { - version = "~> 1.0" + version = "~> 1.1" } provider "local" { diff --git a/google-cloud/container-linux/kubernetes/workers/workers.tf b/google-cloud/container-linux/kubernetes/workers/workers.tf index 99b297b1..5eb21e77 100644 --- a/google-cloud/container-linux/kubernetes/workers/workers.tf +++ b/google-cloud/container-linux/kubernetes/workers/workers.tf @@ -56,10 +56,6 @@ resource "google_compute_instance_template" "worker" { boot = true source_image = "${var.os_image}" disk_size_gb = "${var.disk_size}" - - // Set explicit name to match the new default name set by the API. - // https://github.com/terraform-providers/terraform-provider-google/issues/574 - device_name = "persistent-disk-0" } network_interface {