Skip to content

Commit

Permalink
move to authorized list rather than lookup
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Davis committed Mar 18, 2020
1 parent f6d6e29 commit a1ee41b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a

| Name | Version |
|------|---------|
<<<<<<< HEAD
| aws | >= 2.52.0 |
=======
| aws | >= 2.44.0 |
>>>>>>> move to authorized list rather than lookup
| kubernetes | >= 1.6.2 |
| local | >= 1.2 |
| null | >= 2.1 |
Expand All @@ -144,7 +148,11 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
| cluster\_create\_timeout | Timeout value when creating the EKS cluster. | `string` | `"30m"` | no |
| cluster\_delete\_timeout | Timeout value when deleting the EKS cluster. | `string` | `"15m"` | no |
| cluster\_enabled\_log\_types | A list of the desired control plane logging to enable. For more information, see Amazon EKS Control Plane Logging documentation (https://docs.aws.amazon.com/eks/latest/userguide/control-plane-logs.html) | `list(string)` | `[]` | no |
<<<<<<< HEAD
| cluster\_encryption\_config | Configuration block with encryption configuration for the cluster. See examples/secrets\_encryption/main.tf for example format | <pre>list(object({<br> provider_key_arn = string<br> resources = list(string)<br> }))</pre> | `[]` | no |
=======
| cluster\_endpoint\_private\_access\_cidrs | List of CIDR blocks which can access the Amazon EKS private API, when public access is disabled | `list(string)` | <pre>[<br> "127.0.0.1/32"<br>]</pre> | no |
>>>>>>> move to authorized list rather than lookup
| cluster\_endpoint\_private\_access | Indicates whether or not the Amazon EKS private API server endpoint is enabled. | `bool` | `false` | no |
| cluster\_endpoint\_private\_access\_cidrs | List of CIDR blocks which can access the Amazon EKS private API server endpoint, when public access is disabled | `list(string)` | <pre>[<br> "0.0.0.0/0"<br>]</pre> | no |
| cluster\_endpoint\_public\_access | Indicates whether or not the Amazon EKS public API server endpoint is enabled. | `bool` | `true` | no |
Expand Down
3 changes: 3 additions & 0 deletions data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,8 @@ data "aws_iam_instance_profile" "custom_worker_group_launch_template_iam_instanc
local.workers_group_defaults["iam_instance_profile_name"],
)
}
<<<<<<< HEAD
data "aws_region" "current" {}
=======
>>>>>>> move to authorized list rather than lookup

0 comments on commit a1ee41b

Please sign in to comment.