Merge branch 'master' into variable_fixes

This commit is contained in:
Brandon J. O'Connor
2018-07-11 01:12:32 -07:00
committed by GitHub
4 changed files with 23 additions and 20 deletions

View File

@@ -39,6 +39,7 @@ variable "subnets" {
variable "tags" {
description = "A map of tags to add to all resources."
type = "map"
default = {}
}
@@ -92,15 +93,17 @@ variable "kubeconfig_aws_authenticator_command" {
variable "kubeconfig_aws_authenticator_additional_args" {
description = "Any additional arguments to pass to the authenticator such as the role to assume [\"-r\", \"MyEksRole\"]"
type = "list"
default = []
}
variable "kubeconfig_aws_authenticator_env_variables" {
description = "Environment variables that should be used when executing the authenticator i.e. { AWS_PROFILE = \"eks\"}"
type = "map"
default = {}
}
variable "kubeconfig_name" {
description = "Override the default name used for items kubeconfig"
description = "Override the default name used for items kubeconfig."
default = ""
}