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

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

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -6,7 +6,7 @@ Notable changes between versions.
* Update etcd from v3.3.11 to [v3.3.12](https://github.com/etcd-io/etcd/releases/tag/v3.3.12) * Update etcd from v3.3.11 to [v3.3.12](https://github.com/etcd-io/etcd/releases/tag/v3.3.12)
* Update Calico from v3.5.0 to v3.5.1 * Update Calico from v3.5.0 to v3.5.1
* Assign priorityClassNames to critical cluster and node components * Assign priorityClassNames to critical cluster and node components ([#406](https://github.com/poseidon/typhoon/pull/406))
* Informs node out-of-resource eviction and scheduler preemption and ordering * Informs node out-of-resource eviction and scheduler preemption and ordering
#### Bare-Metal #### Bare-Metal
@ -15,6 +15,8 @@ Notable changes between versions.
#### Google Cloud #### Google Cloud
* Support `terraform-provider-google` v2.0+ ([#407](https://github.com/poseidon/typhoon/pull/407))
* Require `terraform-provider-google` v1.19+ (action required)
* Set the minimum CPU platform to Intel Haswell ([#405](https://github.com/poseidon/typhoon/pull/405)) * Set the minimum CPU platform to Intel Haswell ([#405](https://github.com/poseidon/typhoon/pull/405))
* Haswell or better is available in every zone (no price change) * Haswell or better is available in every zone (no price change)
* A few zones still default to Sandy/Ivy Bridge (shifts in April 2019) * A few zones still default to Sandy/Ivy Bridge (shifts in April 2019)

2
docs/atomic/google-cloud.md
View File

@ -45,7 +45,7 @@ Configure the Google Cloud provider to use your service account key, project-id,
```tf ```tf
provider "google" { provider "google" {
version = "1.6" version = "2.0.0"
alias = "default" alias = "default"
credentials = "${file("~/.config/google-cloud/terraform.json")}" credentials = "${file("~/.config/google-cloud/terraform.json")}"

2
docs/cl/google-cloud.md
View File

@ -49,7 +49,7 @@ Configure the Google Cloud provider to use your service account key, project-id,
```tf ```tf
provider "google" { provider "google" {
version = "1.6" version = "2.0.0"
alias = "default" alias = "default"
credentials = "${file("~/.config/google-cloud/terraform.json")}" credentials = "${file("~/.config/google-cloud/terraform.json")}"

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

@ -11,7 +11,7 @@ resource "google_dns_record_set" "etcds" {
ttl = 300 ttl = 300
# private IPv4 address for etcd # 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 # Zones in the region
@ -24,7 +24,7 @@ locals {
# controllers over up to 3 zones, since all GCP regions have at least 3. # controllers over up to 3 zones, since all GCP regions have at least 3.
zones = "${slice(data.google_compute_zones.all.names, 0, 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 # Controller instances

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

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

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

@ -11,7 +11,7 @@ resource "google_dns_record_set" "etcds" {
ttl = 300 ttl = 300
# private IPv4 address for etcd # 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 # Zones in the region
@ -24,7 +24,7 @@ locals {
# controllers over up to 3 zones, since all GCP regions have at least 3. # controllers over up to 3 zones, since all GCP regions have at least 3.
zones = "${slice(data.google_compute_zones.all.names, 0, 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 # Controller instances

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

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