Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Feb 23, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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

#### Bare-Metal
Expand All @@ -15,6 +15,8 @@ Notable changes between versions.

#### 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))
* Haswell or better is available in every zone (no price change)
* A few zones still default to Sandy/Ivy Bridge (shifts in April 2019)
Expand Down
2 changes: 1 addition & 1 deletion docs/atomic/google-cloud.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Configure the Google Cloud provider to use your service account key, project-id,

```tf
provider "google" {
version = "1.6"
version = "2.0.0"
alias = "default"

credentials = "${file("~/.config/google-cloud/terraform.json")}"
Expand Down
2 changes: 1 addition & 1 deletion docs/cl/google-cloud.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Configure the Google Cloud provider to use your service account key, project-id,

```tf
provider "google" {
version = "1.6"
version = "2.0.0"
alias = "default"

credentials = "${file("~/.config/google-cloud/terraform.json")}"
Expand Down
4 changes: 2 additions & 2 deletions google-cloud/container-linux/kubernetes/controllers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion google-cloud/container-linux/kubernetes/require.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
}

provider "google" {
version = "~> 1.6"
version = ">= 1.19, < 3.0"
}

provider "local" {
Expand Down
4 changes: 2 additions & 2 deletions google-cloud/fedora-atomic/kubernetes/controllers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion google-cloud/fedora-atomic/kubernetes/require.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
}

provider "google" {
version = "~> 1.6"
version = ">= 1.19, < 3.0"
}

provider "local" {
Expand Down