Skip to content

Commit

Permalink
Allow terraform-provider-aws v3.0+ plugin
Browse files Browse the repository at this point in the history
* Typhoon AWS is compatible with terraform-provider-aws v3.x releases
* Continue to allow v2.23+, no v3.x specific features are used
* Set required provider versions in the worker module, since
it can be used independently

Related:

* https://github.com/terraform-providers/terraform-provider-aws/releases/tag/v3.0.0
  • Loading branch information
dghubble committed Aug 9, 2020
1 parent e1d6ab2 commit f6e40dc
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 2 deletions.
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+
* 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"
}
}

0 comments on commit f6e40dc

Please sign in to comment.