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

Add support for terraform-provider-aws v2.0+ #419

Merged
merged 1 commit into from
Mar 9, 2019
Merged

Add support for terraform-provider-aws v2.0+ #419

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: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aws/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 "aws" {
version = "~> 1.13"
version = ">= 1.13, < 3.0"
}

provider "local" {
Expand Down
2 changes: 1 addition & 1 deletion aws/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 "aws" {
version = "~> 1.13"
version = ">= 1.13, < 3.0"
}

provider "local" {
Expand Down
4 changes: 2 additions & 2 deletions docs/atomic/aws.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`).
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/atomic/bare-metal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/atomic/digital-ocean.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`).
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 @@ -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`).
Expand Down
4 changes: 2 additions & 2 deletions docs/cl/aws.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/cl/azure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/cl/bare-metal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/cl/digital-ocean.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
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 @@ -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.
Expand Down