From 968febb050a8dc4f504c5e644895dc7fe0280270 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 7 Dec 2020 00:17:53 -0800 Subject: [PATCH] Add support for Terraform v0.14.x * Support Terraform v0.13.x and v0.14.x --- CHANGES.md | 1 + aws/fedora-coreos/kubernetes/bootstrap.tf | 2 +- aws/fedora-coreos/kubernetes/versions.tf | 2 +- aws/fedora-coreos/kubernetes/workers/versions.tf | 2 +- aws/flatcar-linux/kubernetes/bootstrap.tf | 2 +- aws/flatcar-linux/kubernetes/versions.tf | 2 +- aws/flatcar-linux/kubernetes/workers/versions.tf | 2 +- azure/fedora-coreos/kubernetes/bootstrap.tf | 2 +- azure/fedora-coreos/kubernetes/versions.tf | 2 +- azure/fedora-coreos/kubernetes/workers/versions.tf | 2 +- azure/flatcar-linux/kubernetes/bootstrap.tf | 2 +- azure/flatcar-linux/kubernetes/versions.tf | 2 +- azure/flatcar-linux/kubernetes/workers/versions.tf | 2 +- bare-metal/fedora-coreos/kubernetes/bootstrap.tf | 2 +- bare-metal/fedora-coreos/kubernetes/versions.tf | 2 +- bare-metal/flatcar-linux/kubernetes/bootstrap.tf | 2 +- bare-metal/flatcar-linux/kubernetes/versions.tf | 2 +- digital-ocean/fedora-coreos/kubernetes/bootstrap.tf | 2 +- digital-ocean/fedora-coreos/kubernetes/versions.tf | 2 +- digital-ocean/flatcar-linux/kubernetes/bootstrap.tf | 2 +- digital-ocean/flatcar-linux/kubernetes/versions.tf | 2 +- docs/topics/maintenance.md | 3 ++- google-cloud/fedora-coreos/kubernetes/bootstrap.tf | 2 +- google-cloud/fedora-coreos/kubernetes/versions.tf | 2 +- google-cloud/fedora-coreos/kubernetes/workers/versions.tf | 2 +- google-cloud/flatcar-linux/kubernetes/bootstrap.tf | 2 +- google-cloud/flatcar-linux/kubernetes/versions.tf | 2 +- google-cloud/flatcar-linux/kubernetes/workers/versions.tf | 2 +- 28 files changed, 29 insertions(+), 27 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1de0d80b..7c152c0e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ Notable changes between versions. * Kubernetes [v1.20.0-rc.0](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#v1200-rc0) * 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/bootstrap.tf b/aws/fedora-coreos/kubernetes/bootstrap.tf index 1ad5f2f1..cd153a27 100644 --- a/aws/fedora-coreos/kubernetes/bootstrap.tf +++ b/aws/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/aws/fedora-coreos/kubernetes/versions.tf b/aws/fedora-coreos/kubernetes/versions.tf index 0ec41c2f..38af1942 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" + required_version = ">= 0.13.0, < 0.15.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 73e42fa7..7f883f63 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { aws = ">= 2.23, <= 4.0" template = "~> 2.1" diff --git a/aws/flatcar-linux/kubernetes/bootstrap.tf b/aws/flatcar-linux/kubernetes/bootstrap.tf index d9664083..34abc203 100644 --- a/aws/flatcar-linux/kubernetes/bootstrap.tf +++ b/aws/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/aws/flatcar-linux/kubernetes/versions.tf b/aws/flatcar-linux/kubernetes/versions.tf index 0ec41c2f..38af1942 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" + required_version = ">= 0.13.0, < 0.15.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 73e42fa7..7f883f63 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { aws = ">= 2.23, <= 4.0" template = "~> 2.1" diff --git a/azure/fedora-coreos/kubernetes/bootstrap.tf b/azure/fedora-coreos/kubernetes/bootstrap.tf index 1910df05..8d7f0aba 100644 --- a/azure/fedora-coreos/kubernetes/bootstrap.tf +++ b/azure/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/azure/fedora-coreos/kubernetes/versions.tf b/azure/fedora-coreos/kubernetes/versions.tf index 5773a4ff..9a947828 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" + required_version = ">= 0.13.0, < 0.15.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 0640af4e..2a6559c0 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { azurerm = "~> 2.8" template = "~> 2.1" diff --git a/azure/flatcar-linux/kubernetes/bootstrap.tf b/azure/flatcar-linux/kubernetes/bootstrap.tf index 1cd81fd6..22e9e48f 100644 --- a/azure/flatcar-linux/kubernetes/bootstrap.tf +++ b/azure/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/azure/flatcar-linux/kubernetes/versions.tf b/azure/flatcar-linux/kubernetes/versions.tf index 5773a4ff..9a947828 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" + required_version = ">= 0.13.0, < 0.15.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 0640af4e..2a6559c0 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { azurerm = "~> 2.8" template = "~> 2.1" diff --git a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf index d5c2990d..4a9e2c3a 100644 --- a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf +++ b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] diff --git a/bare-metal/fedora-coreos/kubernetes/versions.tf b/bare-metal/fedora-coreos/kubernetes/versions.tf index 67de974c..1932ac1d 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { template = "~> 2.1" null = "~> 2.1" diff --git a/bare-metal/flatcar-linux/kubernetes/bootstrap.tf b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf index 61937fc2..e86dd048 100644 --- a/bare-metal/flatcar-linux/kubernetes/bootstrap.tf +++ b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] diff --git a/bare-metal/flatcar-linux/kubernetes/versions.tf b/bare-metal/flatcar-linux/kubernetes/versions.tf index 47f2c08a..9e5c136b 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { template = "~> 2.1" null = "~> 2.1" diff --git a/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf b/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf index dcae6478..40fce8d0 100644 --- a/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf +++ b/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/digital-ocean/fedora-coreos/kubernetes/versions.tf b/digital-ocean/fedora-coreos/kubernetes/versions.tf index 13326fc4..c9deb492 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { template = "~> 2.1" null = "~> 2.1" diff --git a/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf b/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf index 280ffb07..a2f3d165 100644 --- a/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf +++ b/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/digital-ocean/flatcar-linux/kubernetes/versions.tf b/digital-ocean/flatcar-linux/kubernetes/versions.tf index 13326fc4..c9deb492 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { template = "~> 2.1" null = "~> 2.1" diff --git a/docs/topics/maintenance.md b/docs/topics/maintenance.md index 9443d140..72be9670 100644 --- a/docs/topics/maintenance.md +++ b/docs/topics/maintenance.md @@ -197,7 +197,8 @@ Typhoon modules have been updated for v0.13.x, but retain compatibility with v0. | Typhoon Release | Terraform version | |-------------------|---------------------| -| v1.18.8 - ? | v0.12.26+, v0.13.x | +| v1.20.0 - ? | v0.13.x, v0.14.x | +| v1.18.8 - v1.19.4 | 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/bootstrap.tf b/google-cloud/fedora-coreos/kubernetes/bootstrap.tf index 225b3e19..98baeddd 100644 --- a/google-cloud/fedora-coreos/kubernetes/bootstrap.tf +++ b/google-cloud/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/google-cloud/fedora-coreos/kubernetes/versions.tf b/google-cloud/fedora-coreos/kubernetes/versions.tf index b8176d9d..99bd431f 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" + required_version = ">= 0.13.0, < 0.15.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 33166ff6..9404132f 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { google = ">= 2.19, < 4.0" template = "~> 2.1" diff --git a/google-cloud/flatcar-linux/kubernetes/bootstrap.tf b/google-cloud/flatcar-linux/kubernetes/bootstrap.tf index 62c3c795..e18ee063 100644 --- a/google-cloud/flatcar-linux/kubernetes/bootstrap.tf +++ b/google-cloud/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=2ed597002a6bdf2222df7e7746706aa9cda17573" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/google-cloud/flatcar-linux/kubernetes/versions.tf b/google-cloud/flatcar-linux/kubernetes/versions.tf index b8176d9d..99bd431f 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" + required_version = ">= 0.13.0, < 0.15.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 33166ff6..9404132f 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" + required_version = ">= 0.13.0, < 0.15.0" required_providers { google = ">= 2.19, < 4.0" template = "~> 2.1"