Skip to content

Commit 186572d

Browse files
Merge pull request #51 from terraform-aws-modules/release/v1.2.0
releasing v1.2.0
2 parents 6cac72a + 85b8357 commit 186572d

File tree

6 files changed

+77
-51
lines changed

6 files changed

+77
-51
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
# I have issues
22

3-
## I'm submitting a
3+
## I'm submitting a...
44

55
* [ ] bug report
66
* [ ] feature request
77
* [ ] support request
8+
* [ ] kudos, thank you, warm fuzzy
89

9-
## What is the current behavior
10+
## What is the current behavior?
1011

11-
## If this is a bug, how to reproduce? Please include a code sample
1212

13-
## What's the expected behavior
1413

15-
## Environment
14+
## If this is a bug, how to reproduce? Please include a code sample if relevvant.
15+
16+
17+
18+
## What's the expected behavior?
19+
20+
21+
22+
## Are you able to fix this problem and submit a PR? Link here if you have already.
23+
24+
## Environment details
1625

1726
* Affected module version:
1827
* OS:
1928
* Terraform version:
2029

21-
## Other relevant info
30+
## Any other relevant info

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ Please explain the changes you made here and link to any relevant issues.
99
- [ ] `terraform fmt` and `terraform validate` both work from the root and `examples/eks_test_fixture` directories (look in CI for an example)
1010
- [ ] Tests for the changes have been added and passing (for bug fixes/features)
1111
- [ ] Test results are pasted in this PR (in lieu of CI)
12-
- [ ] Docs have been added/updated (for bug fixes/features)
13-
- [ ] Any breaking changes are noted in the description above
12+
- [ ] Docs have been updated using `terraform-docs` per `README.md` instructions
13+
- [ ] I've added my change to CHANGELOG.md
14+
- [ ] Any breaking changes are highlighted above

CHANGELOG.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,28 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
66
project adheres to [Semantic Versioning](http://semver.org/).
77

8-
## [[v1.3.0]()] - ]
8+
## [[v1.3.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v1.2.0...v1.3.0)] - 2018-07-??]
99

1010
### Added
1111

12-
- new variable `pre_userdata` added to worker launch configuration allows to run scripts before the plugin does anything.
12+
- your excellent addition. (Hat-tip, @self 👒)
13+
14+
### Changed
15+
16+
- your excellent change. (Boomshakalaka, @self 🏀)
17+
18+
## [[v1.2.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v1.1.0...v1.2.0)] - 2018-07-01]
19+
20+
### Added
21+
22+
- new variable `pre_userdata` added to worker launch configuration allows to run scripts before the plugin does anything. (W00t, @jimbeck 🦉)
23+
24+
### Changed
25+
26+
- kubeconfig made much more flexible. (Bang up job, @sdavids13 💥)
27+
- ASG desired capacity is now ignored as ASG size is more effectively handed by k8s. (Thanks, @ozbillwang 💇‍♂️)
28+
- Providing security groups didn't behave as expected. This has been fixed. (Good catch, @jimbeck 🔧)
29+
- workstation cidr to be allowed by created security group is now more flexible. (A welcome addition, @jimbeck 🔐)
1330

1431
## [[v1.1.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v1.0.0...v1.1.0)] - 2018-06-25]
1532

README.md

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Read the [AWS docs on EKS to get connected to the k8s dashboard](https://docs.aw
1212

1313
## Assumptions
1414

15-
- You want to create an EKS cluster and an autoscaling group of workers for the cluster.
16-
- You want these resources to exist within security groups that allow communication and coordination. These can be user provided or created within the module.
17-
- You've created a Virtual Private Cloud (VPC) and subnets where you intend to put the EKS resources.
18-
- If using the default variable value (`true`) for `configure_kubectl_session`, it's required that both [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) (>=1.10) and [`heptio-authenticator-aws`](https://github.com/heptio/authenticator#4-set-up-kubectl-to-use-heptio-authenticator-for-aws-tokens) are installed and on your shell's PATH.
15+
* You want to create an EKS cluster and an autoscaling group of workers for the cluster.
16+
* You want these resources to exist within security groups that allow communication and coordination. These can be user provided or created within the module.
17+
* You've created a Virtual Private Cloud (VPC) and subnets where you intend to put the EKS resources.
18+
* If using the default variable value (`true`) for `configure_kubectl_session`, it's required that both [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) (>=1.10) and [`heptio-authenticator-aws`](https://github.com/heptio/authenticator#4-set-up-kubectl-to-use-heptio-authenticator-for-aws-tokens) are installed and on your shell's PATH.
1919

2020
## Usage example
2121

@@ -41,15 +41,15 @@ come up with the spare time (hah!), release may happen more often on occasion.
4141

4242
This module has been packaged with [awspec](https://github.com/k1LoW/awspec) tests through [kitchen](https://kitchen.ci/) and [kitchen-terraform](https://newcontext-oss.github.io/kitchen-terraform/). To run them:
4343

44-
1. Install [rvm](https://rvm.io/rvm/install) and the ruby version specified in the [Gemfile](https://github.com/terraform-aws-modules/terraform-aws-eks/tree/master/Gemfile).
45-
2. Install bundler and the gems from our Gemfile:
44+
1. Install [rvm](https://rvm.io/rvm/install) and the ruby version specified in the [Gemfile](https://github.com/terraform-aws-modules/terraform-aws-eks/tree/master/Gemfile).
45+
2. Install bundler and the gems from our Gemfile:
4646

4747
```bash
4848
gem install bundler && bundle install
4949
```
5050

51-
3. Ensure your AWS environment is configured (i.e. credentials and region) for test.
52-
4. Test using `bundle exec kitchen test` from the root of the repo.
51+
3. Ensure your AWS environment is configured (i.e. credentials and region) for test.
52+
4. Test using `bundle exec kitchen test` from the root of the repo.
5353

5454
For now, connectivity to the kubernetes cluster is not tested but will be in the
5555
future. If `configure_kubectl_session` is set `true`, once the test fixture has
@@ -92,38 +92,38 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
9292
9393
## Inputs
9494
95-
| Name | Description | Type | Default | Required |
96-
| --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | :----: | :------: | :------: |
97-
| cluster_name | Name of the EKS cluster. Also used as a prefix in names of related resources. | string | - | yes |
98-
| cluster_security_group_id | If provided, the EKS cluster will be attached to this security group. If not given, a security group will be created with necessary ingres/egress to work with the workers and provide API access to your current IP/32. | string | `` | no |
99-
| cluster_version | Kubernetes version to use for the EKS cluster. | string | `1.10` | no |
100-
| 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 |
101-
| configure_kubectl_session | Configure the current session's kubectl to use the instantiated EKS cluster. | string | `true` | no |
102-
| kubeconfig_context_name | Name of the kubeconfig context. | map | `aws` | no |
103-
| kubeconfig_user_name | Name of the kubeconfig user. | map | `aws` | no |
104-
| kubeconfig_aws_authenticator_command | Command to use to to fetch AWS EKS credentials | map | `heptio-authenticator-aws` | no |
105-
| kubeconfig_aws_authenticator_additional_args | Any additional arguments to pass to the authenticator such as the role to assume `["-r", "MyEksRole"]` | map | `<list>` | no |
106-
| kubeconfig_aws_authenticator_env_variables | Environment variables that should be used when executing the authenticator i.e. `{ AWS_PROFILE = "eks"}` | map | `<map>` | no |
107-
| subnets | A list of subnets to place the EKS cluster and workers within. | list | - | yes |
108-
| tags | A map of tags to add to all resources. | string | `<map>` | no |
109-
| vpc_id | VPC where the cluster and workers will be deployed. | string | - | yes |
110-
| worker_groups | A list of maps defining worker group configurations. See workers_group_defaults for valid keys. | list | `<list>` | no |
111-
| worker_security_group_id | If provided, all workers will be attached to this security group. If not given, a security group will be created with necessary ingres/egress to work with the EKS cluster. | string | `` | no |
112-
| worker_sg_ingress_from_port | Minimum port number from which pods will accept communication. Must be changed to a lower value if some pods in your cluster will expose a port lower than 1025 (e.g. 22, 80, or 443). | string | `1025` | no |
113-
| workers_group_defaults | Default values for target groups as defined by the list of maps. | map | `<map>` | no |
114-
| workstation_cidr | Override the default ingress rule that allows communication with the EKS cluster API. If not given, will use current IP/32. | string | - | no |
95+
| Name | Description | Type | Default | Required |
96+
|------|-------------|:----:|:-----:|:-----:|
97+
| cluster_name | Name of the EKS cluster. Also used as a prefix in names of related resources. | string | - | yes |
98+
| cluster_security_group_id | If provided, the EKS cluster will be attached to this security group. If not given, a security group will be created with necessary ingres/egress to work with the workers and provide API access to your current IP/32. | string | `` | no |
99+
| cluster_version | Kubernetes version to use for the EKS cluster. | string | `1.10` | no |
100+
| 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 |
101+
| configure_kubectl_session | Configure the current session's kubectl to use the instantiated EKS cluster. | string | `true` | no |
102+
| kubeconfig_aws_authenticator_additional_args | Any additional arguments to pass to the authenticator such as the role to assume ["-r", "MyEksRole"] | string | `<list>` | no |
103+
| kubeconfig_aws_authenticator_command | Command to use to to fetch AWS EKS credentials | string | `heptio-authenticator-aws` | no |
104+
| kubeconfig_aws_authenticator_env_variables | Environment variables that should be used when executing the authenticator i.e. { AWS_PROFILE = "eks"} | string | `<map>` | no |
105+
| kubeconfig_context_name | Name of the kubeconfig context. | string | `aws` | no |
106+
| kubeconfig_user_name | Name of the kubeconfig user. | string | `aws` | no |
107+
| subnets | A list of subnets to place the EKS cluster and workers within. | list | - | yes |
108+
| tags | A map of tags to add to all resources. | string | `<map>` | no |
109+
| vpc_id | VPC where the cluster and workers will be deployed. | string | - | yes |
110+
| worker_groups | A list of maps defining worker group configurations. See workers_group_defaults for valid keys. | list | `<list>` | no |
111+
| worker_security_group_id | If provided, all workers will be attached to this security group. If not given, a security group will be created with necessary ingres/egress to work with the EKS cluster. | string | `` | no |
112+
| worker_sg_ingress_from_port | Minimum port number from which pods will accept communication. Must be changed to a lower value if some pods in your cluster will expose a port lower than 1025 (e.g. 22, 80, or 443). | string | `1025` | no |
113+
| workers_group_defaults | Default values for target groups as defined by the list of maps. | map | `<map>` | no |
114+
| workstation_cidr | Override the default ingress rule that allows communication with the EKS cluster API. If not given, will use current IP/32. | string | `` | no |
115115

116116
## Outputs
117117

118-
| Name | Description |
119-
| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
118+
| Name | Description |
119+
|------|-------------|
120120
| 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. |
121-
| cluster_endpoint | The endpoint for your EKS Kubernetes API. |
122-
| cluster_id | The name/id of the EKS cluster. |
123-
| cluster_security_group_id | Security group ID attached to the EKS cluster. |
124-
| cluster_version | The Kubernetes server version for the EKS cluster. |
125-
| config_map_aws_auth | A kubernetes configuration to authenticate to this EKS cluster. |
126-
| kubeconfig | kubectl config file contents for this EKS cluster. |
127-
| worker_iam_role_name | IAM role name attached to EKS workers |
128-
| worker_security_group_id | Security group ID attached to the EKS workers. |
129-
| workers_asg_arns | IDs of the autoscaling groups containing workers. |
121+
| cluster_endpoint | The endpoint for your EKS Kubernetes API. |
122+
| cluster_id | The name/id of the EKS cluster. |
123+
| cluster_security_group_id | Security group ID attached to the EKS cluster. |
124+
| cluster_version | The Kubernetes server version for the EKS cluster. |
125+
| config_map_aws_auth | A kubernetes configuration to authenticate to this EKS cluster. |
126+
| kubeconfig | kubectl config file contents for this EKS cluster. |
127+
| worker_iam_role_name | IAM role name attached to EKS workers |
128+
| worker_security_group_id | Security group ID attached to the EKS workers. |
129+
| workers_asg_arns | IDs of the autoscaling groups containing workers. |

main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
* ```hcl
2626
* module "eks" {
2727
* source = "terraform-aws-modules/eks/aws"
28-
* version = "0.1.0"
2928
* cluster_name = "test-eks-cluster"
3029
* subnets = ["subnet-abcde012", "subnet-bcde012a"]
3130
* tags = "${map("Environment", "test")}"

version

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

0 commit comments

Comments
 (0)