diff --git a/README.md b/README.md index cdd4b4c6..e38404b2 100644 --- a/README.md +++ b/README.md @@ -183,12 +183,13 @@ Other examples: module "label" { source = "cloudposse/label/null" # Cloud Posse recommends pinning every module to a specific version - # version = "x.x.x" + # version = "x.x.x" + namespace = var.namespace name = var.name stage = var.stage delimiter = var.delimiter - attributes = compact(concat(var.attributes, ["cluster"])) + attributes = ["cluster"] tags = var.tags } @@ -249,7 +250,7 @@ Other examples: module "eks_cluster" { source = "cloudposse/eks-cluster/aws" # Cloud Posse recommends pinning every module to a specific version - # version = "x.x.x" + # version = "x.x.x" vpc_id = module.vpc.vpc_id subnet_ids = module.subnets.public_subnet_ids @@ -372,7 +373,6 @@ Available targets: | [kubernetes](#requirement\_kubernetes) | >= 1.13 | | [local](#requirement\_local) | >= 1.3 | | [null](#requirement\_null) | >= 2.0 | -| [template](#requirement\_template) | >= 2.0 | | [tls](#requirement\_tls) | >= 2.2.0 | ## Providers diff --git a/README.yaml b/README.yaml index e17e6dcf..d2f4b052 100644 --- a/README.yaml +++ b/README.yaml @@ -138,12 +138,13 @@ usage: |2- module "label" { source = "cloudposse/label/null" # Cloud Posse recommends pinning every module to a specific version - # version = "x.x.x" + # version = "x.x.x" + namespace = var.namespace name = var.name stage = var.stage delimiter = var.delimiter - attributes = compact(concat(var.attributes, ["cluster"])) + attributes = ["cluster"] tags = var.tags } @@ -204,7 +205,7 @@ usage: |2- module "eks_cluster" { source = "cloudposse/eks-cluster/aws" # Cloud Posse recommends pinning every module to a specific version - # version = "x.x.x" + # version = "x.x.x" vpc_id = module.vpc.vpc_id subnet_ids = module.subnets.public_subnet_ids diff --git a/docs/terraform.md b/docs/terraform.md index cbd885cc..1229edcd 100644 --- a/docs/terraform.md +++ b/docs/terraform.md @@ -8,7 +8,6 @@ | [kubernetes](#requirement\_kubernetes) | >= 1.13 | | [local](#requirement\_local) | >= 1.3 | | [null](#requirement\_null) | >= 2.0 | -| [template](#requirement\_template) | >= 2.0 | | [tls](#requirement\_tls) | >= 2.2.0 | ## Providers diff --git a/examples/complete/fixtures.us-east-2.tfvars b/examples/complete/fixtures.us-east-2.tfvars index 9c3d8769..1514a08f 100644 --- a/examples/complete/fixtures.us-east-2.tfvars +++ b/examples/complete/fixtures.us-east-2.tfvars @@ -24,8 +24,6 @@ max_size = 3 min_size = 2 -disk_size = 20 - kubernetes_labels = {} cluster_encryption_config_enabled = true diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 9bdfa8b0..59eb055d 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -4,7 +4,7 @@ provider "aws" { module "label" { source = "cloudposse/label/null" - version = "0.24.1" + version = "0.25.0" attributes = ["cluster"] context = module.this.context @@ -34,7 +34,7 @@ locals { module "vpc" { source = "cloudposse/vpc/aws" - version = "0.21.1" + version = "0.28.1" cidr_block = "172.16.0.0/16" tags = local.tags @@ -44,7 +44,7 @@ module "vpc" { module "subnets" { source = "cloudposse/dynamic-subnets/aws" - version = "0.39.3" + version = "0.39.8" availability_zones = var.availability_zones vpc_id = module.vpc.vpc_id @@ -85,7 +85,7 @@ module "eks_cluster" { module "eks_node_group" { source = "cloudposse/eks-node-group/aws" - version = "0.20.0" + version = "0.27.0" subnet_ids = module.subnets.private_subnet_ids cluster_name = module.eks_cluster.eks_cluster_id @@ -94,7 +94,6 @@ module "eks_node_group" { min_size = var.min_size max_size = var.max_size kubernetes_labels = var.kubernetes_labels - disk_size = var.disk_size # Prevent the node groups from being created before the Kubernetes aws-auth ConfigMap module_depends_on = module.eks_cluster.kubernetes_config_map_id diff --git a/examples/complete/variables.tf b/examples/complete/variables.tf index 69b3e01f..2cdef9d8 100644 --- a/examples/complete/variables.tf +++ b/examples/complete/variables.tf @@ -68,11 +68,6 @@ variable "local_exec_interpreter" { description = "shell to use for local_exec" } -variable "disk_size" { - type = number - description = "Disk size in GiB for worker nodes. Defaults to 20. Terraform will only perform drift detection if a configuration value is provided" -} - variable "instance_types" { type = list(string) description = "Set of instance types associated with the EKS Node Group. Defaults to [\"t3.medium\"]. Terraform will only perform drift detection if a configuration value is provided" diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 48b483c4..088c4e51 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,15 +1,11 @@ terraform { - required_version = ">= 0.13.0" + required_version = ">= 0.14.11" required_providers { aws = { source = "hashicorp/aws" version = ">= 2.0" } - template = { - source = "hashicorp/template" - version = ">= 2.0" - } null = { source = "hashicorp/null" version = ">= 2.0" diff --git a/versions.tf b/versions.tf index c62fd614..b519d110 100644 --- a/versions.tf +++ b/versions.tf @@ -6,10 +6,6 @@ terraform { source = "hashicorp/aws" version = ">= 3.38" } - template = { - source = "hashicorp/template" - version = ">= 2.0" - } null = { source = "hashicorp/null" version = ">= 2.0"