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

Allow terraform-provider-google v3.x plugin versions 

* Typhoon Google Cloud is compatible with `terraform-provider-google`
v3.x releases
* No v3.x specific features are used, so v2.19+ provider versions are
still allowed, to ease migrations
This commit is contained in:
Dalton Hubble 2020-01-11 13:58:23 -08:00
parent 73588cfad3
commit b1f521fc4a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -11,6 +11,11 @@ Notable changes between versions.
* Enable kube-proxy metrics and allow Prometheus scrapes * Enable kube-proxy metrics and allow Prometheus scrapes
* Allow TCP/10249 traffic with worker node sources * Allow TCP/10249 traffic with worker node sources
#### Google
* Allow `terraform-provider-google` v3.0+ ([#617](https://github.com/poseidon/typhoon/pull/617))
* Only enforce `v2.19+` to ease migration, as no v3.x features are used
#### Addons #### Addons
* Update Prometheus from v2.14.0 to [v2.15.2](https://github.com/prometheus/prometheus/releases/tag/v2.15.2) * Update Prometheus from v2.14.0 to [v2.15.2](https://github.com/prometheus/prometheus/releases/tag/v2.15.2)

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 = "2.20.0" version = "3.4.0"
project = "project-id" project = "project-id"
region = "us-central1" region = "us-central1"
credentials = file("~/.config/google-cloud/terraform.json") credentials = file("~/.config/google-cloud/terraform.json")

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

@ -3,7 +3,7 @@
terraform { terraform {
required_version = "~> 0.12.6" required_version = "~> 0.12.6"
required_providers { required_providers {
google = "~> 2.19" google = ">= 2.19, < 4.0"
ct = "~> 0.3" ct = "~> 0.3"
template = "~> 2.1" template = "~> 2.1"
null = "~> 2.1" null = "~> 2.1"