diff --git a/examples/efk/.tf-control b/examples/efk/.tf-control index 2420f8d..280f449 100644 --- a/examples/efk/.tf-control +++ b/examples/efk/.tf-control @@ -1,4 +1,20 @@ +# .tf-control +# allows for setting a specific command to be used for tf-* commands under this git repo +# see tf-control.sh help for more info + +TFCONTROL_VERSION="1.0.5" + TFCOMMAND="terraform_latest" +# TF_CLI_CONFIG_FILE=PATH-TO-FILE/.tf-control.tfrc +# TFARGS="" +# TFNOLOG="" +# TFNOCOLOR="" + +# use the following to force a specific version. An upgrade of an existing 0.12.31 to 1.x +# needs you to cycle through 0.13.17, 0.14.11, and then latest (0.15.5 not needed). Other +# steps in between. See https://github.e.it.census.gov/terraform/support/tree/master/docs/how-to/terraform-upgrade for details +# +#TFCOMMAND="terraform_0.12.31" #TFCOMMAND="terraform_0.13.7" #TFCOMMAND="terraform_0.14.11" -#TF_CLI_CONFIG_FILE=.tf-control.tfrc +#TFCOMMAND="terraform_0.15.5" diff --git a/examples/efk/.tf-control.tfrc b/examples/efk/.tf-control.tfrc index d4b0b15..7425488 100644 --- a/examples/efk/.tf-control.tfrc +++ b/examples/efk/.tf-control.tfrc @@ -1,5 +1,6 @@ -# https://www.terraform.io/docs/cli/config/config-file.html +TFCONTROL_VERSION="1.0.5" +# https://www.terraform.io/docs/cli/config/config-file.html plugin_cache_dir = "/data/terraform/terraform.d/plugin-cache" #disable_checkpoint = true diff --git a/examples/efk/versions.tf b/examples/efk/versions.tf index 931b5db..78e837b 100644 --- a/examples/efk/versions.tf +++ b/examples/efk/versions.tf @@ -1,16 +1,20 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" + source = "hashicorp/aws" + version = ">= 3.0" + } + null = { + source = "hashicorp/null" + version = ">= 1.0" } helm = { - source = "hashicorp/helm" + source = "hashicorp/helm" + version = ">= 1.0" } kubernetes = { - source = "hashicorp/kubernetes" - } - null = { - source = "hashicorp/null" + source = "hashicorp/kubernetes" + version = ">= 1.0" } } required_version = ">= 0.13"