CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-01 08:34:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to support terraform-provider-google v2.0+

Browse Source 
* Support terraform-provider-google v1.19.0, v1.19.1, v1.20.0
and v2.0+ (and allow for future 2.x.y releases)
* Require terraform-provider-google v1.19.0 or newer. v1.19.0
introduced `network_interface` fields `network_ip` and `nat_ip`
to deprecate `address` and `assigned_nat_ip`. Those deprecated
fields are removed in terraform-provider-google v2.0
* https://github.com/terraform-providers/terraform-provider-google/releases/tag/v2.0.0
This commit is contained in:
Dalton Hubble
2019-02-20 00:54:19 -08:00
parent 4294bd0292
commit 7f8572030d
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
google-cloud/fedora-atomic/kubernetes/controllers.tf
View File

@ -11,7 +11,7 @@ resource "google_dns_record_set" "etcds" {
ttl = 300
# private IPv4 address for etcd
rrdatas = ["${element(google_compute_instance.controllers.*.network_interface.0.address, count.index)}"]
rrdatas = ["${element(google_compute_instance.controllers.*.network_interface.0.network_ip, count.index)}"]
}
# Zones in the region
@ -24,7 +24,7 @@ locals {
# controllers over up to 3 zones, since all GCP regions have at least 3.
zones = "${slice(data.google_compute_zones.all.names, 0, 3)}"
controllers_ipv4_public = ["${google_compute_instance.controllers.*.network_interface.0.access_config.0.assigned_nat_ip}"]
controllers_ipv4_public = ["${google_compute_instance.controllers.*.network_interface.0.access_config.0.nat_ip}"]
}
# Controller instances

2
google-cloud/fedora-atomic/kubernetes/require.tf
View File

@ -5,7 +5,7 @@ terraform {
}
provider "google" {
version = "~> 1.6"
version = ">= 1.19, < 3.0"
}
provider "local" {