From fe96da27d7dc7f94b90f773948176594e0c165f6 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 9 Mar 2019 12:03:10 -0800 Subject: [PATCH] Add support for terraform-provider-aws v2.0+ * Allow terraform-provider-aws >= v1.13, but < 3.0. No change to the minimum version, but allow using v2.x.y releases * Verify compatability with terraform-provider-aws v2.1.0 --- CHANGES.md | 4 ++++ aws/container-linux/kubernetes/require.tf | 2 +- aws/fedora-atomic/kubernetes/require.tf | 2 +- docs/atomic/aws.md | 4 ++-- docs/atomic/bare-metal.md | 2 +- docs/atomic/digital-ocean.md | 2 +- docs/atomic/google-cloud.md | 2 +- docs/cl/aws.md | 4 ++-- docs/cl/azure.md | 2 +- docs/cl/bare-metal.md | 2 +- docs/cl/digital-ocean.md | 2 +- docs/cl/google-cloud.md | 2 +- 12 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2da2ab12..4b61c5ca 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,10 @@ Notable changes between versions. * Resolve in-addr.arpa reverse DNS lookups (PTR) for pod IPv4 addresses ([#415](https://github.com/poseidon/typhoon/pull/415)) * Reverse DNS lookups for service IPv4 addresses unchanged +#### AWS + +* Support `terraform-provider-aws` v2.0+ ([#419](https://github.com/poseidon/typhoon/pull/419)) + #### Addons * Update Prometheus from v2.7.1 to v2.7.2 diff --git a/aws/container-linux/kubernetes/require.tf b/aws/container-linux/kubernetes/require.tf index d4754753..68f475d6 100644 --- a/aws/container-linux/kubernetes/require.tf +++ b/aws/container-linux/kubernetes/require.tf @@ -5,7 +5,7 @@ terraform { } provider "aws" { - version = "~> 1.13" + version = ">= 1.13, < 3.0" } provider "local" { diff --git a/aws/fedora-atomic/kubernetes/require.tf b/aws/fedora-atomic/kubernetes/require.tf index d4754753..68f475d6 100644 --- a/aws/fedora-atomic/kubernetes/require.tf +++ b/aws/fedora-atomic/kubernetes/require.tf @@ -5,7 +5,7 @@ terraform { } provider "aws" { - version = "~> 1.13" + version = ">= 1.13, < 3.0" } provider "local" { diff --git a/docs/atomic/aws.md b/docs/atomic/aws.md index ec481ce3..d66798c3 100644 --- a/docs/atomic/aws.md +++ b/docs/atomic/aws.md @@ -21,7 +21,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.7 +Terraform v0.11.12 ``` Read [concepts](/architecture/concepts/) to learn about Terraform, modules, and organizing resources. Change to your infrastructure repository (e.g. `infra`). @@ -44,7 +44,7 @@ Configure the AWS provider to use your access key credentials in a `providers.tf ```tf provider "aws" { - version = "~> 1.60.0" + version = "~> 2.1.0" alias = "default" region = "eu-central-1" diff --git a/docs/atomic/bare-metal.md b/docs/atomic/bare-metal.md index a2151208..870b1b6e 100644 --- a/docs/atomic/bare-metal.md +++ b/docs/atomic/bare-metal.md @@ -171,7 +171,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.7 +Terraform v0.11.12 ``` Add the [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name. diff --git a/docs/atomic/digital-ocean.md b/docs/atomic/digital-ocean.md index 465b49fe..f17089ac 100644 --- a/docs/atomic/digital-ocean.md +++ b/docs/atomic/digital-ocean.md @@ -21,7 +21,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.7 +Terraform v0.11.12 ``` Read [concepts](/architecture/concepts/) to learn about Terraform, modules, and organizing resources. Change to your infrastructure repository (e.g. `infra`). diff --git a/docs/atomic/google-cloud.md b/docs/atomic/google-cloud.md index 2f362b4f..b94e9749 100644 --- a/docs/atomic/google-cloud.md +++ b/docs/atomic/google-cloud.md @@ -22,7 +22,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.7 +Terraform v0.11.12 ``` Read [concepts](/architecture/concepts/) to learn about Terraform, modules, and organizing resources. Change to your infrastructure repository (e.g. `infra`). diff --git a/docs/cl/aws.md b/docs/cl/aws.md index 91338bed..b53513dc 100644 --- a/docs/cl/aws.md +++ b/docs/cl/aws.md @@ -18,7 +18,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.11 +Terraform v0.11.12 ``` Add the [terraform-provider-ct](https://github.com/coreos/terraform-provider-ct) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name. @@ -49,7 +49,7 @@ Configure the AWS provider to use your access key credentials in a `providers.tf ```tf provider "aws" { - version = "~> 1.60.0" + version = "~> 2.1.0" alias = "default" region = "eu-central-1" diff --git a/docs/cl/azure.md b/docs/cl/azure.md index e29aca22..d888628c 100644 --- a/docs/cl/azure.md +++ b/docs/cl/azure.md @@ -21,7 +21,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.11 +Terraform v0.11.12 ``` Add the [terraform-provider-ct](https://github.com/coreos/terraform-provider-ct) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name. diff --git a/docs/cl/bare-metal.md b/docs/cl/bare-metal.md index 970547fd..73b14542 100644 --- a/docs/cl/bare-metal.md +++ b/docs/cl/bare-metal.md @@ -110,7 +110,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.7 +Terraform v0.11.12 ``` Add the [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name. diff --git a/docs/cl/digital-ocean.md b/docs/cl/digital-ocean.md index 8dfcdc16..ade88a96 100644 --- a/docs/cl/digital-ocean.md +++ b/docs/cl/digital-ocean.md @@ -18,7 +18,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.11 +Terraform v0.11.12 ``` Add the [terraform-provider-ct](https://github.com/coreos/terraform-provider-ct) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name. diff --git a/docs/cl/google-cloud.md b/docs/cl/google-cloud.md index 3f27114b..3b60371e 100644 --- a/docs/cl/google-cloud.md +++ b/docs/cl/google-cloud.md @@ -18,7 +18,7 @@ Install [Terraform](https://www.terraform.io/downloads.html) v0.11.x on your sys ```sh $ terraform version -Terraform v0.11.7 +Terraform v0.11.12 ``` Add the [terraform-provider-ct](https://github.com/coreos/terraform-provider-ct) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name.