diff --git a/README.md b/README.md index d8697e1..edbd469 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,8 @@ Available targets: | enabled | Set to false to prevent the module from creating or accessing any resources | string | `true` | no | | masters_name | K8s masters subdomain name in the Kops DNS zone | string | `masters` | no | | nodes_name | K8s nodes subdomain name in the Kops DNS zone | string | `nodes` | no | +| vpc_tag | Tag used to lookup the Kops VPC | string | `Name` | no | +| vpc_tag_values | Tag values list to lookup the Kops VPC | string | `` | no | ## Outputs @@ -102,11 +104,11 @@ Check out these related projects. File a GitHub [issue](https://github.com/cloudposse/terraform-aws-kops-metadata/issues), send us an [email][email] or join our [Slack Community][slack]. -## Commerical Support +## Commercial Support Work directly with our team of DevOps experts via email, slack, and video conferencing. -We provide *commercial support* for all of our [Open Source][github] projects. As a *Dedicated Support* customer, you have access to our team of subject matter experts at a fraction of the cost of a fulltime engineer. +We provide [*commercial support*][commercial_support] for all of our [Open Source][github] projects. As a *Dedicated Support* customer, you have access to our team of subject matter experts at a fraction of the cost of a full-time engineer. [![E-Mail](https://img.shields.io/badge/email-hello@cloudposse.com-blue.svg)](mailto:hello@cloudposse.com) @@ -116,7 +118,7 @@ We provide *commercial support* for all of our [Open Source][github] projects. A - **Bug Fixes.** We'll rapidly work to fix any bugs in our projects. - **Build New Terraform Modules.** We'll develop original modules to provision infrastructure. - **Cloud Architecture.** We'll assist with your cloud strategy and design. -- **Implementation.** We'll provide hands on support to implement our reference architectures. +- **Implementation.** We'll provide hands-on support to implement our reference architectures. ## Community Forum @@ -200,6 +202,7 @@ Check out [our other projects][github], [apply for a job][jobs], or [hire us][hi [docs]: https://docs.cloudposse.com/ [website]: https://cloudposse.com/ [github]: https://github.com/cloudposse/ + [commercial_support]: https://github.com/orgs/cloudposse/projects [jobs]: https://cloudposse.com/jobs/ [hire]: https://cloudposse.com/contact/ [slack]: https://slack.cloudposse.com/ diff --git a/docs/terraform.md b/docs/terraform.md index 2d33f76..4a0c53c 100644 --- a/docs/terraform.md +++ b/docs/terraform.md @@ -8,6 +8,8 @@ | enabled | Set to false to prevent the module from creating or accessing any resources | string | `true` | no | | masters_name | K8s masters subdomain name in the Kops DNS zone | string | `masters` | no | | nodes_name | K8s nodes subdomain name in the Kops DNS zone | string | `nodes` | no | +| vpc_tag | Tag used to lookup the Kops VPC | string | `Name` | no | +| vpc_tag_values | Tag values list to lookup the Kops VPC | string | `` | no | ## Outputs diff --git a/main.tf b/main.tf index 24f8092..a029322 100644 --- a/main.tf +++ b/main.tf @@ -4,8 +4,8 @@ data "aws_vpc" "kops" { count = "${var.enabled == "true" ? 1 : 0}" filter { - name = "tag:Name" - values = ["${var.dns_zone}"] + name = "tag:${var.vpc_tag}" + values = ["${concat(var.vpc_tag_values, list(var.dns_zone))}"] } } diff --git a/variables.tf b/variables.tf index df6106e..dcc9350 100644 --- a/variables.tf +++ b/variables.tf @@ -25,3 +25,13 @@ variable "nodes_name" { default = "nodes" description = "K8s nodes subdomain name in the Kops DNS zone" } + +variable "vpc_tag" { + default = "Name" + description = "Tag used to lookup the Kops VPC" +} + +variable "vpc_tag_values" { + default = [] + description = "Tag values list to lookup the Kops VPC" +}