CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dalton Hubble 2017-11-04 12:48:01 -07:00
parent 26a291aef4
commit a48dd9ebd8
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
google-cloud/container-linux/kubernetes/controllers/controllers.tf
View File

@ -50,10 +50,6 @@ resource "google_compute_instance_template" "controller" {
boot = true boot = true
source_image = "${var.os_image}" source_image = "${var.os_image}"
disk_size_gb = "${var.disk_size}" 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 { network_interface {

2
google-cloud/container-linux/kubernetes/require.tf
View File

@ -5,7 +5,7 @@ terraform {
} }
provider "google" { provider "google" {
version = "~> 1.0" version = "~> 1.1"
} }
provider "local" { provider "local" {

4
google-cloud/container-linux/kubernetes/workers/workers.tf
View File

@ -56,10 +56,6 @@ resource "google_compute_instance_template" "worker" {
boot = true boot = true
source_image = "${var.os_image}" source_image = "${var.os_image}"
disk_size_gb = "${var.disk_size}" 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 { network_interface {