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.

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

Allow terraform-provider-aws v3.0+ plugin #803

Merged
merged 2 commits into from
Aug 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ Notable changes between versions.
* Update CNI plugins and fix CVEs with Flannel (non-default)
* Transition to a poseidon maintained container image

### AWS

* Allow `terraform-provider-aws` v3.0+ ([#803](https://github.com/poseidon/typhoon/pull/803))
* Recommend updating `terraform-provider-aws` to v3.0+
* Continue to allow v2.23+, no v3.x specific features are used

### Fedora CoreOS

* Fix support for Flannel with Fedora CoreOS ([#795](https://github.com/poseidon/typhoon/pull/795))
Expand Down
2 changes: 1 addition & 1 deletion aws/container-linux/kubernetes/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
terraform {
required_version = "~> 0.12.6"
required_providers {
aws = "~> 2.23"
aws = ">= 2.23, <= 4.0"
ct = "~> 0.4"
template = "~> 2.1"
null = "~> 2.1"
Expand Down
5 changes: 5 additions & 0 deletions aws/container-linux/kubernetes/workers/versions.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

terraform {
required_version = ">= 0.12"
required_providers {
aws = ">= 2.23, <= 4.0"
ct = "~> 0.4"
template = "~> 2.1"
}
}
2 changes: 1 addition & 1 deletion aws/fedora-coreos/kubernetes/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
terraform {
required_version = "~> 0.12.6"
required_providers {
aws = "~> 2.23"
aws = ">= 2.23, <= 4.0"
ct = "~> 0.4"
template = "~> 2.1"
null = "~> 2.1"
Expand Down
5 changes: 5 additions & 0 deletions aws/fedora-coreos/kubernetes/workers/versions.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

terraform {
required_version = ">= 0.12"
required_providers {
aws = ">= 2.23, <= 4.0"
ct = "~> 0.4"
template = "~> 2.1"
}
}
2 changes: 1 addition & 1 deletion docs/fedora-coreos/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Configure the AWS provider to use your access key credentials in a `providers.tf

```tf
provider "aws" {
version = "2.70.0"
version = "3.1.0"
region = "eu-central-1"
shared_credentials_file = "/home/user/.config/aws/credentials"
}
Expand Down
2 changes: 1 addition & 1 deletion docs/fedora-coreos/azure.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Configure the Azure provider in a `providers.tf` file.

```tf
provider "azurerm" {
version = "2.19.0"
version = "2.22.0"
}

provider "ct" {
Expand Down
2 changes: 1 addition & 1 deletion docs/fedora-coreos/bare-metal.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Configure the Matchbox provider to use your Matchbox API endpoint and client cer

```tf
provider "matchbox" {
version = "0.3.0"
version = "0.4.0"
endpoint = "matchbox.example.com:8081"
client_cert = file("~/.config/matchbox/client.crt")
client_key = file("~/.config/matchbox/client.key")
Expand Down
2 changes: 1 addition & 1 deletion docs/fedora-coreos/google-cloud.md
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 = "3.30.0"
version = "3.33.0"
project = "project-id"
region = "us-central1"
credentials = file("~/.config/google-cloud/terraform.json")
Expand Down
2 changes: 1 addition & 1 deletion docs/flatcar-linux/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Configure the AWS provider to use your access key credentials in a `providers.tf

```tf
provider "aws" {
version = "2.70.0"
version = "3.1.0"
region = "eu-central-1"
shared_credentials_file = "/home/user/.config/aws/credentials"
}
Expand Down
2 changes: 1 addition & 1 deletion docs/flatcar-linux/azure.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Configure the Azure provider in a `providers.tf` file.

```tf
provider "azurerm" {
version = "2.19.0"
version = "2.22.0"
}

provider "ct" {
Expand Down
2 changes: 1 addition & 1 deletion docs/flatcar-linux/bare-metal.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Configure the Matchbox provider to use your Matchbox API endpoint and client cer

```tf
provider "matchbox" {
version = "0.3.0"
version = "0.4.0"
endpoint = "matchbox.example.com:8081"
client_cert = file("~/.config/matchbox/client.crt")
client_key = file("~/.config/matchbox/client.key")
Expand Down
2 changes: 1 addition & 1 deletion docs/flatcar-linux/google-cloud.md
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 = "3.30.0"
version = "3.33.0"
project = "project-id"
region = "us-central1"
credentials = file("~/.config/google-cloud/terraform.json")
Expand Down