Commit Graph

110 Commits

Author SHA1 Message Date
Igor Konforti
da53b5cab3 changing timeout (#736)
* change timeout

* Update README.md

Co-authored-by: Max Williams <max.williams@deliveryhero.com>
2020-02-27 11:41:41 +01:00
Dawid Rogaczewski
3e44835172 change default value for wait_for_cluster_cmd (#750)
* change wait_for_cluster_cmd method

change default method for wait_for_cluster_cmd from curl to wget to solve https://github.com/terraform-aws-modules/terraform-aws-eks/issues/741

* Update CHANGELOG.md

* update docs

Co-authored-by: Max Williams <max.williams@deliveryhero.com>
2020-02-27 11:31:20 +01:00
Ryan Ooi
f2cc9f5039 Revert #631. Add back manage security group flag (#722)
* Revert #631

* fix README lint

* fix README lint for bool
2020-02-27 11:23:41 +01:00
Max Williams
626a393ab9 Remove of autoscaling IAM policy related stuff (#716)
* Disable management of autoscaling IAM policy by default

* remove completely

* update changelog notes

* fix pre-commit stuff

* misc updates

* fmt

* fix changelog

* Removal of tags and update docs

* Change after updating terraform-docs

* Add second tag
2020-02-04 19:34:17 +01:00
Sanjeev Giri
905d9f05a9 Configurable local exec command for waiting until cluster is healthy (#701)
* Configurable local exec command for waiting until cluster is healthy

* readme

* line feeds

* format

* fix readme

* fix readme

* Configurable local exec command for waiting until cluster is healthy (#1)

* Configurable local exec command for waiting until cluster is healthy

* readme

* line feeds

* format

* fix readme

* fix readme

* change log

* Configurable local exec wait 4 cluster op (#2)

* Configurable local exec command for waiting until cluster is healthy

* readme

* line feeds

* format

* fix readme

* fix readme

* change log

* changelog (#3)

* Changelog (#4)

* changelog

* changelog

* simplify wait_for_cluster command

* readme

* no op for manage auth false

* formatting

* docs? not sure

* linter

* specify dependency to wait for cluster more accurately
2020-01-27 16:29:24 +01:00
Siddarth Prakash
82aefb20f5 Add public access endpoint CIDRs option (terraform-aws-eks#647) (#673)
* Add public access endpoint CIDRs option (terraform-aws-eks#647)

* Update required provider version to 2.44.0

* Fix formatting in docs
2020-01-10 00:53:33 +01:00
Daniel Piddock
11147e9af3 Node groups submodule (#650)
* WIP Move node_groups to a submodule

* Split the old node_groups file up

* Start moving locals

* Simplify IAM creation logic

* depends_on from the TF docs

* Wire in the variables

* Call module from parent

* Allow to customize the role name. As per workers

* aws_auth ConfigMap for node_groups

* Get the managed_node_groups example to plan

* Get the basic example to plan too

* create_eks = false works

"The true and false result expressions must have consistent types. The
given expressions are object and object, respectively."
Well, that's useful. But apparently set(string) and set() are ok. So
everything else is more complicated. Thanks.

* Update Changelog

* Update README

* Wire in node_groups_defaults

* Remove node_groups from workers_defaults_defaults

* Synchronize random and node_group defaults

* Error: "name_prefix" cannot be longer than 32

* Update READMEs again

* Fix double destroy

Was producing index errors when running destroy on an empty state.

* Remove duplicate iam_role in node_group

I think this logic works. Needs some testing with an externally created
role.

* Fix index fail if node group manually deleted

* Keep aws_auth template in top module

Downside: count causes issues as usual: can't use distinct() in the
child module so there's a template render for every node_group even if
only one role is really in use. Hopefully just output noise instead of
technical issue

* Hack to have node_groups depend on aws_auth etc

The AWS Node Groups create or edit the aws-auth ConfigMap so that nodes
can join the cluster. This breaks the kubernetes resource which cannot
do a force create. Remove the race condition with explicit depend.

Can't pull the IAM role out of the node_group any more.

* Pull variables via the random_pet to cut logic

No point having the same logic in two different places

* Pass all ForceNew variables through the pet

* Do a deep merge of NG labels and tags

* Update README.. again

* Additional managed node outputs #644

Add change from @TBeijin from PR #644

* Remove unused local

* Use more for_each

* Remove the change when create_eks = false

* Make documentation less confusing

* node_group version user configurable

* Pass through raw output from aws_eks_node_groups

* Merge workers defaults in the locals

This simplifies the random_pet and aws_eks_node_group logic. Which was
causing much consernation on the PR.

* Fix typo

Co-authored-by: Max Williams <max.williams@deliveryhero.com>
2020-01-09 12:53:08 +01:00
Ryan Ooi
b7ffc1b591 Control plane security group always whitelist worker security group and revert #186 (#631)
* Updates and revert #186

* update readme

* update changelog

* update changelog
2019-12-20 16:45:01 +01:00
Alaa Qutaish
583c32d286 Add IRSA support (#632) 2019-12-19 16:38:12 +01:00
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
William Morgan
cf3dcc5c58 Support for EKS Managed Node Groups (#602)
* Finished first cut of managed node groups

* Updated formatting and extra fields.

* Updating Changelog and README

* Fixing formatting

* Fixing docs.

* Updating required Version

* Updating changelog

* Adding example for managed node groups

* Managed IAM Roles for Nodegroups now have correct policies. Tags can now be added to node groups.

* Fixing bug where people could set source_security_group_ids without setting ssh key causing a race condition within the aws provider.

* Adding lifecycle create_before_destroy

* Adding random pet names for create_before_destroy

* Updating per comments.

* Updating required versions of terraform

* Updating per comments.

* Updating vars

* Updating minimum version for terraform

* Change worker_groups_managed_node_groups to node_groups

* Using for_each on the random_pet

* Adding changes recommended by @eytanhanig

* Update node_groups.tf
2019-12-04 18:30:36 +01:00
Hwanjin Jeong
a4117177f6 Fix typo (#595)
* fix typos

* remove unnecessary comment
2019-11-18 18:10:53 +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
Joshua Spence
4369f0271b Allow config_output_path to specify the full path (#549) 2019-10-21 14:55:29 +02:00
Bruno M. Custódio
c81e1d2fa7 Allow for specifying a custom AMI for the worker nodes. (#551)
Signed-off-by: Bruno Miguel Custódio <brunomcustodio@gmail.com>
2019-10-21 13:04:04 +02:00
Daniel Piddock
813c607e90 Make "dangerous" policy attachments optional (#539) 2019-10-04 14:25:19 +02:00
Thierno IB. BARRY
186c88a34b Add option to enable lifecycle hooks creation (#532)
* add option to enable lifecycle hooks creation

* update changelog
2019-09-26 19:40:41 +02:00
Roman Voitenko
f79c790153 Gpu workers support (#515)
* added posibility to use Amazon EKS-Optimized AMI with GPU Support for workers

* updated CHANGELOG.md

* added missing var prefix

* updated Changelog to ver 6.x.x
2019-09-23 17:50:01 +02:00
Xiangxuan Liu
347db3e230 Improve CI pipeline 2019-09-19 10:20:29 +08: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
Ivanich
a47f464221 Allow to set user defined workers role name (#496)
* Allow to set user defined workers role name

* Add changelog entry

* Keep single variable for worker role name
2019-09-12 17:45:04 +02:00
刘相轩
6c3e4ec510 Update to EKS 1.14 (#498) 2019-09-09 10:46:02 +02:00
Daniel Piddock
655a75fbd0 Update cluster_security_group_id doc (#472)
You cannot filter the public cluster endpoint.
2019-08-19 16:34:02 +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
till-krauss
ba3377360e Added Option to use KMS key for cloudwatch logs group. (#404) 2019-06-24 12:53:43 +02:00
Gauthier
8260f1095e EKS 1.13 out (#400)
* Update to EKS 1.13

* Revert "Pin terraform version < 0.12"

This reverts commit 4c71b12218378914c276715a85a61ac5aece9fa0.

* Update providers in examples and format
2019-06-20 12:18:12 +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
Yurii Polishchuk
bf5dae00e1 Enable log retention for cloudwatch log groups (#387)
* enable log retention for cloudwatch log groups

* revert version bump

* set default retention to 90 days
2019-06-13 10:03:34 +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
f0838165e2 Fix annoying typo: worker_group_xx vs worker_groups_xx (#374) 2019-05-07 18:22:39 +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
Max Williams
2439c25771 Cleaning up and deduplicating launch template related code (#370)
* cleaning up launch template code

* update changelog

* Remove variable worker_group_launch_template_tags

* misc fixes

* fixing and simplifying example
2019-05-07 15:41:44 +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
Scott Crooks
18e00861e4 Adding EKS Control Plane logging options (#340)
* Adding EKS Control Plane logging options

* Added feature addition

* Removing 'optional'

* Adding documentation, and changing variable order

* Using pre-commit instead

* adding IAM instance profiles to outputs, addresses #323 (#329)

* adding IAM instance profiles to outputs

* updating changelog

* updated README
2019-04-11 15:21:09 +02:00
Stijn De Haes
7a4484552f Update to 1.12 (#327) 2019-04-03 12:30:58 +02:00
Stijn De Haes
806edb6001 Add support for eks endpoint_private_access and endpoint_public_access (#314) 2019-03-25 12:05:32 +01:00
Nicolas Szalay
bef3c36a40 Allow additional policies to be attached to worker nodes (#308)
Example usage : we want our nodes to be able to update route53 record
for using external-dns.

```hcl
data "template_file" "eks_worker_additional_route53_policy" {
  template = "${file("iam/route53_policy.json.tpl")}"
}

resource "aws_iam_policy" "eks_worker_additional_route53_policy" {
  description = "Allow nodes to update our zone"
  name = "${module.k8s_cluster01_label.id}-additional-route53-policy"
  policy = "${data.template_file.eks_worker_additional_route53_policy.rendered}"
}
```

which defines the policy; then in the EKS module :
```hcl
module "cluster01" {
  cluster_name = "cluster01"
<snip>
  workers_addtional_policies = [
    "${aws_iam_policy.eks_worker_additional_route53_policy.arn}"
  ]
  workers_addtional_policies_count = 1
<snip>
```
2019-03-20 13:30:16 +01:00
Brandon J. O'Connor
bb9c1b0b54 Merge pull request #284 from tekn0ir/iam_path
Add optional iam_path
2019-03-06 23:09:00 -08:00
Max Williams
95986471f0 Adding optional name filter variable to be able to pin worker AMI to a release 2019-03-05 14:57:22 +01:00
Anders Åslund
3728299161 Add optional iam_path 2019-03-05 12:31:35 +01:00
Dylan Hellems
a1a1644f80 Add optional permissions_boundary (#265)
* Add optional permissions_boundary

* Update CHANGELOG
2019-02-07 16:38:16 +01: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
Stefan Sedich
35747d707a Worker group tags (#252)
* Allow per worker group ASG tags to be set

* Format

* Set correct defaults

* Implement hack that will use the first item in the list if a matching item does not exist for the worker group

* Use a map that will map from the worker group name to the tags to get around the issue where list indexing does not work with a list of lists

* Format

* Cleanup

* Fix sample

* README
2019-01-31 15:38:53 +01:00
Jonathan Boulle
95d4e78f2f Fix variable description typo, regenerate README (#247) 2019-01-15 12:03:48 +01:00
skang0601
f3ab7c67da Allows worker groups to be created using AWS Launch Templates (#222) 2019-01-10 16:19:19 +01:00
Max Williams
982541a4ec Updates for v2.0.0 release (#216)
* Updates for version 2.0 release

* Updating readme

* update this version file that I've never seen before

* finish changelog updates
2018-12-17 10:50:21 +01:00
rmakram-ims
9d6740e116 Add ability to pass computed values to cluster_security_group_id and worker_security_group_id (#186)
* Add ability to pass computer values to cluster_security_group_id and worker_security_group_id

* Fix contributer name in CHANGELOG.md

* Format variables.tf file
2018-12-13 17:00:48 +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
Max Williams
6d38ca4ead Small update after adding with-aggregate-type-defaults option to terraform-docs (#209) 2018-12-12 17:07:10 +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