From da6aafe816024dc3327fc17777e7a0b40aed4cbd Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 3 Mar 2018 16:56:34 -0800 Subject: [PATCH] Revert "Add module version requirements to internal workers modules" * This reverts commit cce45374874d8a5d30f584dbdc9dad1d0e8c6287. * Provider passing to child modules is complex and the behavior changed between Terraform v0.10 and v0.11. We're continuing to allow both versions so this change should be reverted. For the time being, those using our internal Terraform modules will have to be aware of the minimum version for AWS and GCP providers, there is no good way to do enforcement. --- aws/container-linux/kubernetes/workers/require.tf | 9 --------- docs/advanced/worker-pools.md | 4 ---- .../container-linux/kubernetes/workers/require.tf | 9 --------- 3 files changed, 22 deletions(-) delete mode 100644 aws/container-linux/kubernetes/workers/require.tf delete mode 100644 google-cloud/container-linux/kubernetes/workers/require.tf diff --git a/aws/container-linux/kubernetes/workers/require.tf b/aws/container-linux/kubernetes/workers/require.tf deleted file mode 100644 index 5137494d..00000000 --- a/aws/container-linux/kubernetes/workers/require.tf +++ /dev/null @@ -1,9 +0,0 @@ -# Terraform version and plugin versions - -terraform { - required_version = ">= 0.10.4" -} - -provider "aws" { - version = "~> 1.7" -} diff --git a/docs/advanced/worker-pools.md b/docs/advanced/worker-pools.md index 488cf8c8..161ea498 100644 --- a/docs/advanced/worker-pools.md +++ b/docs/advanced/worker-pools.md @@ -79,10 +79,6 @@ Create a cluster following the Google Cloud [tutorial](../google-cloud.md#cluste module "yavin-worker-pool" { source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes/workers?ref=v1.9.4" - providers = { - google = "google.default" - } - # Google Cloud region = "us-central1" network = "${module.google-cloud-yavin.network_name}" diff --git a/google-cloud/container-linux/kubernetes/workers/require.tf b/google-cloud/container-linux/kubernetes/workers/require.tf deleted file mode 100644 index 2493e57a..00000000 --- a/google-cloud/container-linux/kubernetes/workers/require.tf +++ /dev/null @@ -1,9 +0,0 @@ -# Terraform version and plugin versions - -terraform { - required_version = ">= 0.10.4" -} - -provider "google" { - version = "~> 1.2" -}