Skip to content

Commit 31ec0f7

Browse files
Dominik-Kmax-rocket-internet
authored andcommitted
Update documentation for removed configure_kubectl_session (#171)
* Updated description of `config_output_path` & `write_kubeconfig` variables There's no `configure_kubectl_session` anymore. * Readme: Updated to remove `configure_kubectl_session` There's no `configure_kubectl_session` anymore. * Changelog updated
1 parent 1652c68 commit 31ec0f7

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
1717
- Remove aws_iam_service_linked_role (by @max-rocket-internet)
1818
- Adjust the order and correct/update the ec2 instance type info. (@chenrui333)
1919
- Removed providers from `main.tf`. (by @max-rocket-internet)
20+
- Removed `configure_kubectl_session` references in documentation [#171](https://github.com/terraform-aws-modules/terraform-aws-eks/pull/171) (by @dominik-k)
2021

2122
## [[v1.7.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v1.6.0...v1.7.0)] - 2018-10-09]
2223

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Read the [AWS docs on EKS to get connected to the k8s dashboard](https://docs.aw
1515
* You want to create an EKS cluster and an autoscaling group of workers for the cluster.
1616
* You want these resources to exist within security groups that allow communication and coordination. These can be user provided or created within the module.
1717
* 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 [`aws-iam-authenticator`](https://github.com/kubernetes-sigs/aws-iam-authenticator#4-set-up-kubectl-to-use-authentication-tokens-provided-by-aws-iam-authenticator-for-kubernetes) are installed and on your shell's PATH.
18+
* If `manage_aws_auth = true`, it's required that both [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) (>=1.10) and [`aws-iam-authenticator`](https://github.com/kubernetes-sigs/aws-iam-authenticator#4-set-up-kubectl-to-use-authentication-tokens-provided-by-aws-iam-authenticator-for-kubernetes) are installed and on your shell's PATH.
1919

2020
## Usage example
2121

@@ -56,9 +56,12 @@ This module has been packaged with [awspec](https://github.com/k1LoW/awspec) tes
5656
4. Test using `bundle exec kitchen test` from the root of the repo.
5757

5858
For now, connectivity to the kubernetes cluster is not tested but will be in the
59-
future. If `configure_kubectl_session` is set `true`, once the test fixture has
60-
converged, you can query the test cluster from that terminal session with
61-
`kubectl get nodes --watch --kubeconfig kubeconfig`.
59+
future. Once the test fixture has converged, you can query the test cluster from
60+
that terminal session with
61+
```bash
62+
kubectl get nodes --watch --kubeconfig kubeconfig
63+
```
64+
(using default settings `config_output_path = "./"` & `write_kubeconfig = true`)
6265

6366
## Doc generation
6467

@@ -103,7 +106,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
103106
| cluster_name | Name of the EKS cluster. Also used as a prefix in names of related resources. | string | - | yes |
104107
| 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 |
105108
| cluster_version | Kubernetes version to use for the EKS cluster. | string | `1.10` | no |
106-
| 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. Should end in a forward slash / . | string | `./` | no |
109+
| config_output_path | Where to save the Kubectl config file (if `write_kubeconfig = true`). Should end in a forward slash `/` . | string | `./` | no |
107110
| kubeconfig_aws_authenticator_additional_args | Any additional arguments to pass to the authenticator such as the role to assume. e.g. ["-r", "MyEksRole"]. | list | `<list>` | no |
108111
| kubeconfig_aws_authenticator_command | Command to use to to fetch AWS EKS credentials. | string | `aws-iam-authenticator` | no |
109112
| kubeconfig_aws_authenticator_env_variables | Environment variables that should be used when executing the authenticator. e.g. { AWS_PROFILE = "eks"}. | map | `<map>` | no |
@@ -121,7 +124,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
121124
| 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 |
122125
| 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 |
123126
| workers_group_defaults | Override default values for target groups. See workers_group_defaults_defaults in locals.tf for valid keys. | map | `<map>` | no |
124-
| write_kubeconfig | Whether to write a kubeconfig file containing the cluster configuration. | string | `true` | no |
127+
| write_kubeconfig | Whether to write a Kubectl config file containing the cluster configuration. Saved to `config_output_path`. | string | `true` | no |
125128
126129
## Outputs
127130

main.tf

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
** You want to create an EKS cluster and an autoscaling group of workers for the cluster.
1717
** You want these resources to exist within security groups that allow communication and coordination. These can be user provided or created within the module.
1818
** You've created a Virtual Private Cloud (VPC) and subnets where you intend to put the EKS resources.
19-
** 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 [`aws-iam-authenticator`](https://github.com/kubernetes-sigs/aws-iam-authenticator#4-set-up-kubectl-to-use-authentication-tokens-provided-by-aws-iam-authenticator-for-kubernetes) are installed and on your shell's PATH.
19+
** If `manage_aws_auth = true`, it's required that both [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) (>=1.10) and [`aws-iam-authenticator`](https://github.com/kubernetes-sigs/aws-iam-authenticator#4-set-up-kubectl-to-use-authentication-tokens-provided-by-aws-iam-authenticator-for-kubernetes) are installed and on your shell's PATH.
2020
2121
* ## Usage example
2222
@@ -57,9 +57,12 @@
5757
* 4. Test using `bundle exec kitchen test` from the root of the repo.
5858
5959
* For now, connectivity to the kubernetes cluster is not tested but will be in the
60-
* future. If `configure_kubectl_session` is set `true`, once the test fixture has
61-
* converged, you can query the test cluster from that terminal session with
62-
* `kubectl get nodes --watch --kubeconfig kubeconfig`.
60+
* future. Once the test fixture has converged, you can query the test cluster from
61+
* that terminal session with
62+
* ```bash
63+
* kubectl get nodes --watch --kubeconfig kubeconfig
64+
* ```
65+
* (using default settings `config_output_path = "./"` & `write_kubeconfig = true`)
6366
6467
* ## Doc generation
6568

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ variable "cluster_version" {
1313
}
1414

1515
variable "config_output_path" {
16-
description = "Determines where config files are placed if using configure_kubectl_session and you want config files to land outside the current working directory. Should end in a forward slash / ."
16+
description = "Where to save the Kubectl config file (if `write_kubeconfig = true`). Should end in a forward slash `/` ."
1717
default = "./"
1818
}
1919

2020
variable "write_kubeconfig" {
21-
description = "Whether to write a kubeconfig file containing the cluster configuration."
21+
description = "Whether to write a Kubectl config file containing the cluster configuration. Saved to `config_output_path`."
2222
default = true
2323
}
2424

0 commit comments

Comments
 (0)