Commit Graph

30 Commits

Author SHA1 Message Date
Tomislav Tomašić
124ea7c151 Add destroy time flag (#580)
* Add destroy-time flag

* Update changelog

Fix cluster count

* Fix cluster count

* Fix docs

* Fix outputs

* Fix unsupported attribute on cluster_certificate_authority_data output

Co-Authored-By: Daniel Piddock <33028589+dpiddockcmp@users.noreply.github.com>

* Remove unnecessary flatten from cluster_endpoint output

Co-Authored-By: Daniel Piddock <33028589+dpiddockcmp@users.noreply.github.com>

* Improve description of var.enabled

* Fix errors manifesting when used on an existing-cluster

* Update README.md

* Renamed destroy-time flag

* Revert removal of changelog addition entry

* Update flag name in readme

* Update flag variable name

* Update cluster referencing for consistency

* Update flag name to `create_eks`

* Fixed incorrect count-based reference to aws_eks_cluster.this (there's only one)

* Replaced all incorrect aws_eks_cluster.this[count.index] references (there will be just one, so using '[0]').

* Changelog update, explicitly mentioning flag

* Fixed interpolation deprecation warning

* Fixed outputs to support conditional cluster

* Applied create_eks to aws_auth.tf

* Removed unused variable. Updated Changelog. Formatting.

* Fixed references to aws_eks_cluster.this[0] that would raise errors when setting create_eks to false whilst having launch templates or launch configurations configured.

* Readme and example updates.

* Revert "Readme and example updates."

This reverts commit 18a0746355e136010ad54858a1b518406f6a3638.

* Updated readme section of conditionally creation with provider example.

* Added conditions to node_groups.

* Fixed reversed map_roles check

* Update aws_auth.tf

Revert this due to https://github.com/terraform-aws-modules/terraform-aws-eks/pull/611
2019-12-09 10:06:10 +01:00
Shan K
143642fda8 remove empty [] to mapRoles in aws-auth (revised) (#619) 2019-12-09 09:56:55 +01:00
Shan K
fb61b48c26 Fix PR merge: #606 (#611)
* Update aws_auth.tf

* aws-auth config map
2019-12-05 16:54:13 +01:00
Shan K
9de5b53cb4 remove empty [] to mapRoles object in aws-auth (#606)
* remove empty [] to mapRoles object in aws-auth

Simply having ${yamlencode(var.map_roles)} in mapRoles for aws-auth 
creates a empty [] at the end after adding the default roles.
Changing it to be added only when its not empty

* Update aws_auth.tf
2019-12-04 18:46:44 +01:00
Stijn De Haes
9363662574 Use kubernetes provider to manage aws auth (#355)
This commit changes the way aws auth is managed. Before a local file
was used the generate the template and a null resource to apply it. This
is now switched to the terraform kubernetes provider.
2019-11-28 10:25:13 +01:00
Mary Hayes
b69c8fb759 Run aws-auth Update Commands in Sequence and not Parallel (#592)
* Run aws-auth Update Commands in Sequence and not Parallel

* Update changelog
2019-11-20 13:23:56 +01:00
Joonsung Lee
2d52e06786 Add Windows support (#555)
* Add Windows support

* Assign eks:kube-proxy-windows group to worker nodes

* Add Instructions for adding Windows Workers at FAQ.md

* Remove unnecessary variables from userdata_windows.tpl

* Update CHANGELOG.md
2019-10-28 14:16:45 +01:00
Sergiu Plotnicu
461cf5482e Support for Mixed Instances ASG in worker_groups_launch_template variable (#468)
* Create ASG tags via for - utility from terraform 12

* Updated support for mixed ASG in worker_groups_launch_template variable

* Updated launch_template example to include spot and mixed ASG with worker_groups_launch_template variable

* Removed old config

* Removed workers_launch_template_mixed.tf file, added support for mixed/spot in workers_launch_template variable

* Updated examples/spot_instances/main.tf with Mixed Spot and ondemand instances

* Removed launch_template_mixed from relevant files

* Updated README.md file

* Removed workers_launch_template.tf.bkp

* Fixed case with null on_demand_allocation_strategy and Spot allocation

* Fixed workers_launch_template.tf, covered spot instances via Launch Template
2019-09-13 16:50:59 +02:00
刘相轩
8580b67813 Support map users and roles to multiple groups (#424)
* Support map users and roles to multiple groups

* Simplify code by rename `user_arn` to `userarn`, `role_arn` to `rolearn`

* Next version should be 6.x because PR this is a breaking change.

* Update example variables.tf

* Change indent to 2

* Fix map-aws-auth.yaml maybe invalid yaml.
2019-08-19 16:15:01 +02:00
Karoline Pauls
630a0cc3fb Fix fmt for v0.12.6 (#460) 2019-08-06 17:26:05 +02:00
刘相轩
da2c78b8ba Upgrade to terraform 0.12 (#394)
* run terraform upgrade tool

* fix post upgrade TODOs

* use strict typing for variables

* upgrade examples, point them at VPC module tf 0.12 PR

* remove unnecessary `coalesce()` calls

coalesce(lookup(map, key, ""), default) -> lookup(map, key, default)

* Fix autoscaling_enabled broken (#1)

* always set a value for tags, fix coalescelist calls

* always set a value for these tags

* fix tag value

* fix tag value

* default element available

* added default value

* added a general default

without this default - TF is throwing an error when running a destroy

* Fix CI

* Change vpc module back to `terraform-aws-modules/vpc/aws` in example

* Update CHANGELOG.md

* Change type of variable `cluster_log_retention_in_days` to number

* Remove `xx_count` variables

* Actual lists instead of strings with commas

* Remove `xx_count` variable from docs

* Replace element with list indexing

* Change variable `worker_group_tags` to a attribute of worker_group

* Fix workers_launch_template_mixed tags

* Change override_instance_type_x variables to list.

* Update CHANGELOG.md
2019-06-19 09:57:51 +02:00
Max Williams
d6fa9f48ff Better examples, PR template changes, general tidy up (#375)
* adding 3 examples

* removing old example

* updating PR template

* fix this typo

* update after renaming default example

* add missing launch_template_mixed stuff to aws_auth

* fix 2 examples with public subnets

* update changelog for new minor release
2019-05-08 15:11:05 +02:00
Max Williams
ae2f8e58db Adding new mixed type of worker group with instance overrides and mixed instances policy (#371)
* Adding new mixed type of worker group with instance overrides and mixed instances policy

* moving all count and lifecycle rule parameters to top/bottom

* adding custom IAM parts

* updating doc with new options

* fixes for spot instances
2019-05-07 16:50:42 +02:00
Touch Ungboriboonpisal
959e5330e3 Support custom IAM roles for cluster and workers (#338)
* allow specifying custom worker IAM instance profiles

* allow specifying custom cluster IAM role

* add doc

* update changelog

* use data.aws_iam_instance_profile.name
2019-05-07 14:46:06 +02:00
yutachaos
d3c1bd6237 Added write_aws_auth_config option (#228)
* Added update aws auth configmap when manage_aws_auth set false case
and `write_aws_auth_config` variable for not create the aws_auth files option

* Add CHANGELOG

* Changed writing config file process for Windows compatibility.

* Apply terraform-docs and terraform fmt

* Fixed zsh-specific syntax

* Fixed CHANGELOG.md
2019-02-01 13:02:41 +01:00
Erik Lattimore
03c223131f Fix issue where ConfigMap isn't applied to new cluster (#235)
If you are trying to recover a cluster that was deleted, the current
code will not re-apply the ConfigMap because it is already rendered so
kubectl command won't get triggered.

This change adds the cluster endpoint (which should be different when
spinning up a new cluster even with the same name) so we will force a
re-render and cause the kubectl command to run.
2019-01-15 12:14:52 +01:00
Marcello Romani
91eb56f4aa Fix zsh-specific syntax in retry loop within null_resource.update_config_map_aws_auth (#245)
* Fixed zsh-specific syntax, fail if kubectl apply fails after 10 attempts

* Updated CHANGELOG
2019-01-15 12:11:24 +01:00
skang0601
f3ab7c67da Allows worker groups to be created using AWS Launch Templates (#222) 2019-01-10 16:19:19 +01:00
Diego Rodriguez
1822a677dc Supply count for map_accounts, map_roles and map_users (#205)
* Added map_roles_count and user_roles_count (#1)

* Update readme for new vars

* updated tests to include count

* fix syntax error

* updated changelog

* Added map_accounts_count variable for consistency

* Fix counts in example and user latest terraform-docs to generate readme
2018-12-13 15:50:46 +01:00
Andrew Roth
edbea30cfc Fix #187 for windows compatibility (#207)
* Added ability to choose local-exec interpreter

* Remove accidental extra file

* formatting
2018-12-11 14:55:26 +01:00
rmakram-ims
81706207fc Add wait_nodes_max_tries to wait for nodes to be available before applying the kubernetes configurations (#187)
* Add wait_nodes_max_tries to wait for nodes to be available before applying the kubernetes configurations

* Format variables.tf and aws_auth.tf

* Fix template expansion for wait-nodes-ready.tpl

* Ensuring that kubeconfig is created before its use

* Cleanup wait-nodes-ready script

* Simplify logic to retry application of kubernetes config if failed

* Revert file permission change
2018-12-04 09:17:27 +01:00
Matthew Caya
cd7e56c821 Fixed issue with 'workers_group_defaults_defaults.iam_role_id' and added explicit depends_on for 'update_config_map_aws_auth' (#147)
* fix worker default 'iam_role_id' dependency

* Add explicit depends_on to eks cluster for 'update_config_map_aws_auth'
2018-10-09 10:38:00 +02:00
Andrew Lavery
b623bc234a allow specifying an IAM role for each worker group (#137)
* allow creating an IAM role for each worker group

* moved change from 'changed' to 'added'

* create multiple roles not just profiles

* fix config_map_aws_auth generation

* don't duplicate worker-role templating

* specify ARNs for worker groups individually

todo fix aws_auth configmap

* fixed AWS auth

* fix aws_iam_instance_profile.workers name
fix iam_instance_profile fallback

* fix outputs

* fix iam_instance_profile calculation

* hopefully fix aws auth configmap generation

* manually fill out remainder of arn

* remove depends_on in worker_role_arns template file

this was causing resources to be recreated every time

* fmt

* fix typo, move iam_role_id default to defaults map
2018-09-24 16:08:35 +02:00
Brandon O'Connor
66e3403387 test fixture produced an error for the path of kubectl being .// removed the extra slash to fix 2018-07-11 23:32:48 -07:00
Max Williams
404645501d Merge branch 'master' into aws-auth_enhancemnts 2018-07-11 10:57:58 +02:00
Max Williams
6f886e6d37 fixing readme.md
Merge remote-tracking branch 'origin/aws-auth_enhancemnts' into aws-auth_enhancemnts
2018-07-11 10:54:39 +02:00
Max Williams
bb9e241021 finishing doc, tests etc 2018-07-11 10:22:32 +02:00
Max Williams
58c4a0e30f initial commit 2018-07-11 10:21:53 +02:00
Max Williams
2a0a595940 renaming resource and removing trigger 2018-07-10 10:23:48 +02:00
Max Williams
1a1d92da66 Splitting aws-auth and kubectl related resources as they are not related 2018-07-09 12:23:57 +02:00