From 2775f35547d51203392b1d17655fc2e78e134e3f Mon Sep 17 00:00:00 2001 From: Max Williams Date: Tue, 10 Jul 2018 12:28:52 +0200 Subject: [PATCH] updating changelog, variables and readme --- CHANGELOG.md | 6 ++++++ README.md | 13 ++++++++----- variables.tf | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b2d754..a838e80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [[v1.4.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v1.3.0...v1.4.0)] - 2018-07-12] + +### Added + +- New variables `map_accounts`, `map_roles` and `map_users` in order to manage additional entries in the `aws-auth` configmap. (by @max-rocket-internet) + ## [[v1.3.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v1.2.0...v1.3.0)] - 2018-07-??] ### Added diff --git a/README.md b/README.md index 9ca9f01..34c6233 100644 --- a/README.md +++ b/README.md @@ -99,11 +99,13 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | cluster_version | Kubernetes version to use for the EKS cluster. | string | `1.10` | no | | config_output_path | Determines where config files are placed if using configure_kubectl_session and you want config files to land outside the current working directory. | string | `./` | no | | configure_kubectl_session | Configure the current session's kubectl to use the instantiated EKS cluster. | string | `true` | no | -| kubeconfig_aws_authenticator_additional_args | Any additional arguments to pass to the authenticator such as the role to assume. ["-r", "MyEksRole"] | list | `` | no | -| kubeconfig_aws_authenticator_command | Command to use to to fetch AWS EKS credentials. | string | `heptio-authenticator-aws` | no | -| kubeconfig_aws_authenticator_env_variables | Environment variables that should be used when executing the authenticator. e.g. { AWS_PROFILE = "eks"} | map | `` | no | -| kubeconfig_name | Override the default name used for items kubeconfig. | string | `` | no | -| manage_aws_auth | Whether to write and apply the aws-auth configmap file. | string | `true` | no | +| kubeconfig_aws_authenticator_additional_args | Any additional arguments to pass to the authenticator such as the role to assume ["-r", "MyEksRole"] | string | `` | no | +| kubeconfig_aws_authenticator_command | Command to use to to fetch AWS EKS credentials | string | `heptio-authenticator-aws` | no | +| kubeconfig_aws_authenticator_env_variables | Environment variables that should be used when executing the authenticator i.e. { AWS_PROFILE = "eks"} | string | `` | no | +| kubeconfig_name | Override the default name used for items kubeconfig | string | `` | no | +| map_accounts | Additional AWS account numbers to add to the aws-auth configmap. | list | `` | no | +| map_roles | Additional IAM roles to add to the aws-auth configmap. | list | `` | no | +| map_users | Additional IAM users to add to the aws-auth configmap. | list | `` | no | | subnets | A list of subnets to place the EKS cluster and workers within. | list | - | yes | | tags | A map of tags to add to all resources. | map | `` | no | | vpc_id | VPC where the cluster and workers will be deployed. | string | - | yes | @@ -128,3 +130,4 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | worker_iam_role_name | IAM role name attached to EKS workers | | worker_security_group_id | Security group ID attached to the EKS workers. | | workers_asg_arns | IDs of the autoscaling groups containing workers. | + diff --git a/variables.tf b/variables.tf index 9eb67c0..7855e5f 100644 --- a/variables.tf +++ b/variables.tf @@ -33,19 +33,19 @@ variable "manage_aws_auth" { } variable "map_accounts" { - description = "Additional AWS account numbers to add to the aws-auth configmap" + description = "Additional AWS account numbers to add to the aws-auth configmap." type = "list" default = [] } variable "map_roles" { - description = "Additional IAM roles to add to the aws-auth configmap" + description = "Additional IAM roles to add to the aws-auth configmap." type = "list" default = [] } variable "map_users" { - description = "Additional IAM users to add to the aws-auth configmap" + description = "Additional IAM users to add to the aws-auth configmap." type = "list" default = [] }