Skip to content

Commit 6ea3582

Browse files
new release (#452)
1 parent 52286a0 commit 6ea3582

File tree

6 files changed

+18
-23
lines changed

6 files changed

+18
-23
lines changed

CHANGELOG.md

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,33 @@ project adheres to [Semantic Versioning](http://semver.org/).
77

88
## Next release
99

10-
## [[v5.?.?](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v5.0.0...HEAD)] - 2019-06-??]
10+
## [[v5.?.?](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v5.1.0...HEAD)] - 2019-08-??]
11+
12+
### Added
13+
14+
- Write your awesome addition here (by @you)
15+
16+
### Changed
17+
18+
- Write your awesome change here (by @you)
19+
20+
# History
21+
22+
## [[v5.1.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v5.0.0...v5.1.0)] - 2019-07-30]
1123

1224
### Added
1325

1426
- Option to set a KMS key for the log group and encrypt it (by @till-krauss)
1527
- Output the name of the cloudwatch log group (by @gbooth27)
16-
- Option to use spot instances with launch templates without defining pools, especially useful for GPU instance types (@onur-sam-gtn-ai)
1728
- Added `cpu_credits` param for the workers defined in `worker_groups_launch_template` (by @a-shink)
1829
- Added support for EBS Volumes tag in `worker_groups_launch_template` and `workers_launch_template_mixed.tf` (by @sppwf)
19-
- Write your awesome addition here (by @you)
2030

2131
### Changed
2232

2333
- Update default override instance types to work with Cluster Autoscaler (by @nauxliu on behalf of RightCapital)
2434
- Examples now specify `enable_dns_hostnames = true`, as per [EKS documentation](https://docs.aws.amazon.com/eks/latest/userguide/network_reqs.html) (by @karolinepauls)
25-
- Write your awesome change here (by @you)
26-
27-
# History
2835

29-
## [[v5.0.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v4.0.2...v5.0.0)] - 2019-05-07]
36+
## [[v5.0.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v4.0.2...v5.0.0)] - 2019-06-19]
3037

3138
### Added
3239

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
141141
| permissions\_boundary | If provided, all IAM roles will be created with this permissions boundary attached. | string | `""` | no |
142142
| subnets | A list of subnets to place the EKS cluster and workers within. | list(string) | n/a | yes |
143143
| tags | A map of tags to add to all resources. | map(string) | `{}` | no |
144-
| vpc\_id | VPC where the cluster and workers will be deployed. It must satisfy [EKS requirements](https://docs.aws.amazon.com/eks/latest/userguide/network_reqs.html). | string | n/a | yes |
144+
| vpc\_id | VPC where the cluster and workers will be deployed. | string | n/a | yes |
145145
| worker\_additional\_security\_group\_ids | A list of additional security group ids to attach to worker instances | list(string) | `[]` | no |
146146
| worker\_ami\_name\_filter | Additional name filter for AWS EKS worker AMI. Default behaviour will get latest for the cluster_version but could be set to a release from amazon-eks-ami, e.g. "v20190220" | string | `"v*"` | no |
147147
| worker\_create\_security\_group | Whether to create a security group for the workers or attach the workers to `worker_security_group_id`. | bool | `"true"` | no |
@@ -159,6 +159,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
159159
160160
| Name | Description |
161161
|------|-------------|
162+
| cloudwatch\_log\_group\_name | Name of cloudwatch log group created |
162163
| cluster\_arn | The Amazon Resource Name (ARN) of the cluster. |
163164
| cluster\_certificate\_authority\_data | Nested attribute containing certificate-authority-data for your cluster. This is the base64 encoded certificate data required to communicate with your cluster. |
164165
| cluster\_endpoint | The endpoint for your EKS Kubernetes API. |
@@ -167,7 +168,6 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
167168
| cluster\_id | The name/id of the EKS cluster. |
168169
| cluster\_security\_group\_id | Security group ID attached to the EKS cluster. |
169170
| cluster\_version | The Kubernetes server version for the EKS cluster. |
170-
| cloudwatch\_log\_group\_name | The name of the cloudwatch log group created for the EKS cluster. |
171171
| config\_map\_aws\_auth | A kubernetes configuration to authenticate to this EKS cluster. |
172172
| kubeconfig | kubectl config file contents for this EKS cluster. |
173173
| kubeconfig\_filename | The filename of the generated kubectl config. |

local.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ locals {
8181
spot_allocation_strategy = "lowest-price" # The only valid value is lowest-price, which is also the default value. The Auto Scaling group selects the cheapest Spot pools and evenly allocates your Spot capacity across the number of Spot pools that you specify.
8282
spot_instance_pools = 10 # "Number of Spot pools per availability zone to allocate capacity. EC2 Auto Scaling selects the cheapest Spot pools and evenly allocates Spot capacity across the number of Spot pools that you specify."
8383
spot_max_price = "" # Maximum price per unit hour that the user is willing to pay for the Spot instances. Default is the on-demand price
84-
market_type = null # set to "spot" to use spot instances without defining pools
8584
}
8685

8786
workers_group_defaults = merge(
@@ -241,4 +240,3 @@ locals {
241240
"x1e.32xlarge" = true
242241
}
243242
}
244-

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v5.0.0
1+
v5.1.0

workers_launch_template.tf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,6 @@ resource "aws_launch_template" "workers_launch_template" {
229229
)
230230
}
231231

232-
instance_market_options {
233-
market_type = lookup(
234-
var.worker_groups_launch_template[count.index],
235-
"market_type",
236-
local.workers_group_defaults["market_type"],
237-
)
238-
}
239-
240232
block_device_mappings {
241233
device_name = lookup(
242234
var.worker_groups_launch_template[count.index],
@@ -306,4 +298,3 @@ resource "aws_iam_instance_profile" "workers_launch_template" {
306298
)
307299
path = var.iam_path
308300
}
309-

workers_launch_template_mixed.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ resource "aws_launch_template" "workers_launch_template_mixed" {
322322
tags = merge(
323323
{
324324
"Name" = "${aws_eks_cluster.this.name}-${lookup(
325-
var.worker_groups_launch_template[count.index],
325+
var.worker_groups_launch_template_mixed[count.index],
326326
"name",
327327
count.index,
328328
)}-eks_asg"
@@ -348,4 +348,3 @@ resource "aws_iam_instance_profile" "workers_launch_template_mixed" {
348348
)
349349
path = var.iam_path
350350
}
351-

0 commit comments

Comments
 (0)