github-mirrors/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-aws-eks.git synced 2026-04-28 19:37:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR merge: #606 (#611)

Browse Source 
* Update aws_auth.tf

* aws-auth config map
This commit is contained in:
Shan K
2019-12-05 21:24:13 +05:30
committed by Max Williams
parent 9de5b53cb4
commit fb61b48c26
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -12,6 +12,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
- Test against minimum versions specified in `versions.tf` (by @dpiddockcmp) - Test against minimum versions specified in `versions.tf` (by @dpiddockcmp)
- Support for AWS EKS Managed Node Groups. (by @wmorgan6796) - Support for AWS EKS Managed Node Groups. (by @wmorgan6796)
- Updated instance_profile_names and instance_profile_arns outputs to also consider launch template as well as asg (by @ankitwal) - Updated instance_profile_names and instance_profile_arns outputs to also consider launch template as well as asg (by @ankitwal)
- Added a if check on `aws-auth` configmap when map_roles is empty.
- **Breaking:** Configure the aws-auth configmap using the terraform kubernetes providers. Read the [docs](docs/upgrading-to-aws-auth-kubernetes-provider.md) for more info (by @sdehaes) - **Breaking:** Configure the aws-auth configmap using the terraform kubernetes providers. Read the [docs](docs/upgrading-to-aws-auth-kubernetes-provider.md) for more info (by @sdehaes)
- Updated application of `aws-auth` configmap to create `kube_config.yaml` and `aws_auth_configmap.yaml` in sequence (and not parallel) to `kubectl apply` (by @knittingdev) - Updated application of `aws-auth` configmap to create `kube_config.yaml` and `aws_auth_configmap.yaml` in sequence (and not parallel) to `kubectl apply` (by @knittingdev)
- Exit with error code when `aws-auth` configmap is unable to be updated (by @knittingdev) - Exit with error code when `aws-auth` configmap is unable to be updated (by @knittingdev)

2
aws_auth.tf
View File

@@ -53,7 +53,7 @@ resource "kubernetes_config_map" "aws_auth" {
data = { data = {
mapRoles = <<EOF mapRoles = <<EOF
${join("", distinct(concat(data.template_file.launch_template_worker_role_arns.*.rendered, data.template_file.worker_role_arns.*.rendered)))} ${join("", distinct(concat(data.template_file.launch_template_worker_role_arns.*.rendered, data.template_file.worker_role_arns.*.rendered)))}
%{if var.map_roles != []}${yamlencode(var.map_roles)}%{endif} %{if var.map_roles == []}${yamlencode(var.map_roles)}%{endif}
EOF EOF
mapUsers = yamlencode(var.map_users) mapUsers = yamlencode(var.map_users)
mapAccounts = yamlencode(var.map_accounts) mapAccounts = yamlencode(var.map_accounts)