From 86e0f806b36e8f4b9c445db98777473d2141f44c Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 11 Dec 2020 00:47:57 -0800 Subject: [PATCH] Revert "Add support for Terraform v0.14.x" This reverts commit 968febb050a8dc4f504c5e644895dc7fe0280270. --- CHANGES.md | 1 - aws/fedora-coreos/kubernetes/versions.tf | 2 +- aws/fedora-coreos/kubernetes/workers/versions.tf | 2 +- aws/flatcar-linux/kubernetes/versions.tf | 2 +- aws/flatcar-linux/kubernetes/workers/versions.tf | 2 +- azure/fedora-coreos/kubernetes/versions.tf | 2 +- azure/fedora-coreos/kubernetes/workers/versions.tf | 2 +- azure/flatcar-linux/kubernetes/versions.tf | 2 +- azure/flatcar-linux/kubernetes/workers/versions.tf | 2 +- bare-metal/fedora-coreos/kubernetes/versions.tf | 2 +- bare-metal/flatcar-linux/kubernetes/versions.tf | 2 +- digital-ocean/fedora-coreos/kubernetes/versions.tf | 2 +- digital-ocean/flatcar-linux/kubernetes/versions.tf | 2 +- docs/topics/maintenance.md | 3 +-- google-cloud/fedora-coreos/kubernetes/versions.tf | 2 +- google-cloud/fedora-coreos/kubernetes/workers/versions.tf | 2 +- google-cloud/flatcar-linux/kubernetes/versions.tf | 2 +- google-cloud/flatcar-linux/kubernetes/workers/versions.tf | 2 +- 18 files changed, 17 insertions(+), 19 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c78fb03c..fbd214d4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,7 +7,6 @@ Notable changes between versions. * Kubernetes [v1.20.0](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#v1200) * Add input variable validations ([#880](https://github.com/poseidon/typhoon/pull/880)) * Require Terraform v0.13+ ([migration guide](https://typhoon.psdn.io/topics/maintenance/#terraform-versions)) -* Support Terraform v0.13.x and v0.14.x ([#905](https://github.com/poseidon/typhoon/pull/905)) * Set output sensitive to suppress console display for some cases ([#885](https://github.com/poseidon/typhoon/pull/885)) * Add service account token [volume projection](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#service-account-token-volume-projection) ([#897](https://github.com/poseidon/typhoon/pull/897)) * Scope kube-scheduler and kube-controller-manager permissions ([#898](https://github.com/poseidon/typhoon/pull/898)) diff --git a/aws/fedora-coreos/kubernetes/versions.tf b/aws/fedora-coreos/kubernetes/versions.tf index 38af1942..0ec41c2f 100644 --- a/aws/fedora-coreos/kubernetes/versions.tf +++ b/aws/fedora-coreos/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { aws = ">= 2.23, <= 4.0" template = "~> 2.1" diff --git a/aws/fedora-coreos/kubernetes/workers/versions.tf b/aws/fedora-coreos/kubernetes/workers/versions.tf index 7f883f63..73e42fa7 100644 --- a/aws/fedora-coreos/kubernetes/workers/versions.tf +++ b/aws/fedora-coreos/kubernetes/workers/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { aws = ">= 2.23, <= 4.0" template = "~> 2.1" diff --git a/aws/flatcar-linux/kubernetes/versions.tf b/aws/flatcar-linux/kubernetes/versions.tf index 38af1942..0ec41c2f 100644 --- a/aws/flatcar-linux/kubernetes/versions.tf +++ b/aws/flatcar-linux/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { aws = ">= 2.23, <= 4.0" template = "~> 2.1" diff --git a/aws/flatcar-linux/kubernetes/workers/versions.tf b/aws/flatcar-linux/kubernetes/workers/versions.tf index 7f883f63..73e42fa7 100644 --- a/aws/flatcar-linux/kubernetes/workers/versions.tf +++ b/aws/flatcar-linux/kubernetes/workers/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { aws = ">= 2.23, <= 4.0" template = "~> 2.1" diff --git a/azure/fedora-coreos/kubernetes/versions.tf b/azure/fedora-coreos/kubernetes/versions.tf index 9a947828..5773a4ff 100644 --- a/azure/fedora-coreos/kubernetes/versions.tf +++ b/azure/fedora-coreos/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { azurerm = "~> 2.8" template = "~> 2.1" diff --git a/azure/fedora-coreos/kubernetes/workers/versions.tf b/azure/fedora-coreos/kubernetes/workers/versions.tf index 2a6559c0..0640af4e 100644 --- a/azure/fedora-coreos/kubernetes/workers/versions.tf +++ b/azure/fedora-coreos/kubernetes/workers/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { azurerm = "~> 2.8" template = "~> 2.1" diff --git a/azure/flatcar-linux/kubernetes/versions.tf b/azure/flatcar-linux/kubernetes/versions.tf index 9a947828..5773a4ff 100644 --- a/azure/flatcar-linux/kubernetes/versions.tf +++ b/azure/flatcar-linux/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { azurerm = "~> 2.8" template = "~> 2.1" diff --git a/azure/flatcar-linux/kubernetes/workers/versions.tf b/azure/flatcar-linux/kubernetes/workers/versions.tf index 2a6559c0..0640af4e 100644 --- a/azure/flatcar-linux/kubernetes/workers/versions.tf +++ b/azure/flatcar-linux/kubernetes/workers/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { azurerm = "~> 2.8" template = "~> 2.1" diff --git a/bare-metal/fedora-coreos/kubernetes/versions.tf b/bare-metal/fedora-coreos/kubernetes/versions.tf index 1932ac1d..67de974c 100644 --- a/bare-metal/fedora-coreos/kubernetes/versions.tf +++ b/bare-metal/fedora-coreos/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { template = "~> 2.1" null = "~> 2.1" diff --git a/bare-metal/flatcar-linux/kubernetes/versions.tf b/bare-metal/flatcar-linux/kubernetes/versions.tf index 9e5c136b..47f2c08a 100644 --- a/bare-metal/flatcar-linux/kubernetes/versions.tf +++ b/bare-metal/flatcar-linux/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { template = "~> 2.1" null = "~> 2.1" diff --git a/digital-ocean/fedora-coreos/kubernetes/versions.tf b/digital-ocean/fedora-coreos/kubernetes/versions.tf index c9deb492..13326fc4 100644 --- a/digital-ocean/fedora-coreos/kubernetes/versions.tf +++ b/digital-ocean/fedora-coreos/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { template = "~> 2.1" null = "~> 2.1" diff --git a/digital-ocean/flatcar-linux/kubernetes/versions.tf b/digital-ocean/flatcar-linux/kubernetes/versions.tf index c9deb492..13326fc4 100644 --- a/digital-ocean/flatcar-linux/kubernetes/versions.tf +++ b/digital-ocean/flatcar-linux/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { template = "~> 2.1" null = "~> 2.1" diff --git a/docs/topics/maintenance.md b/docs/topics/maintenance.md index 5fc874c6..8ac2c5b1 100644 --- a/docs/topics/maintenance.md +++ b/docs/topics/maintenance.md @@ -197,8 +197,7 @@ Typhoon modules have been updated for v0.13.x, but retain compatibility with v0. | Typhoon Release | Terraform version | |-------------------|---------------------| -| v1.20.0 - ? | v0.13.x, v0.14.x | -| v1.18.8 - v1.19.4 | v0.12.26+, v0.13.x | +| v1.18.8 - ? | v0.12.26+, v0.13.x | | v1.15.0 - v1.18.8 | v0.12.x | | v1.10.3 - v1.15.0 | v0.11.x | | v1.9.2 - v1.10.2 | v0.10.4+ or v0.11.x | diff --git a/google-cloud/fedora-coreos/kubernetes/versions.tf b/google-cloud/fedora-coreos/kubernetes/versions.tf index 99bd431f..b8176d9d 100644 --- a/google-cloud/fedora-coreos/kubernetes/versions.tf +++ b/google-cloud/fedora-coreos/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { google = ">= 2.19, < 4.0" template = "~> 2.1" diff --git a/google-cloud/fedora-coreos/kubernetes/workers/versions.tf b/google-cloud/fedora-coreos/kubernetes/workers/versions.tf index 9404132f..33166ff6 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/versions.tf +++ b/google-cloud/fedora-coreos/kubernetes/workers/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { google = ">= 2.19, < 4.0" template = "~> 2.1" diff --git a/google-cloud/flatcar-linux/kubernetes/versions.tf b/google-cloud/flatcar-linux/kubernetes/versions.tf index 99bd431f..b8176d9d 100644 --- a/google-cloud/flatcar-linux/kubernetes/versions.tf +++ b/google-cloud/flatcar-linux/kubernetes/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { google = ">= 2.19, < 4.0" template = "~> 2.1" diff --git a/google-cloud/flatcar-linux/kubernetes/workers/versions.tf b/google-cloud/flatcar-linux/kubernetes/workers/versions.tf index 9404132f..33166ff6 100644 --- a/google-cloud/flatcar-linux/kubernetes/workers/versions.tf +++ b/google-cloud/flatcar-linux/kubernetes/workers/versions.tf @@ -1,7 +1,7 @@ # Terraform version and plugin versions terraform { - required_version = ">= 0.13.0, < 0.15.0" + required_version = "~> 0.13.0" required_providers { google = ">= 2.19, < 4.0" template = "~> 2.1"