diff --git a/CHANGELOG.md b/CHANGELOG.md index 490e062d62..23aba08f85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,11 +15,13 @@ project adheres to [Semantic Versioning](http://semver.org/). - Ability to configure worker group ASG tags (by @stefansedich) - Added EBS optimized mapping for the g3s.xlarge instance type (by @stefansedich) - `enabled_metrics` input (by @zanitete) +- write_aws_auth_config to input (by @yutachaos) ##### Changed - Change worker group ASG to use create_before_destroy (by @stefansedich) - Fixed a bug where worker group defaults were being used for launch template user data (by @leonsodhi-lf) +- Managed_aws_auth option is true, the aws-auth configmap file is no longer created, and write_aws_auth_config must be set to true to generate config_map. (by @yutachaos) # History diff --git a/README.md b/README.md index c08aa7ad40..291ece540c 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | kubeconfig\_aws\_authenticator\_env\_variables | Environment variables that should be used when executing the authenticator. e.g. { AWS_PROFILE = "eks"}. | map | `{}` | no | | kubeconfig\_name | Override the default name used for items kubeconfig. | string | `""` | no | | local\_exec\_interpreter | Command to run for local-exec resources. Must be a shell-style interpreter. If you are on Windows Git Bash is a good choice. | list | `[ "/bin/sh", "-c" ]` | no | -| manage\_aws\_auth | Whether to write and apply the aws-auth configmap file. | string | `"true"` | no | +| manage\_aws\_auth | Whether to apply the aws-auth configmap file. | string | `"true"` | no | | map\_accounts | Additional AWS account numbers to add to the aws-auth configmap. See examples/eks_test_fixture/variables.tf for example format. | list | `[]` | no | | map\_accounts\_count | The count of accounts in the map_accounts list. | string | `"0"` | no | | map\_roles | Additional IAM roles to add to the aws-auth configmap. See examples/eks_test_fixture/variables.tf for example format. | list | `[]` | no | @@ -145,6 +145,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | 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 | | workers\_group\_defaults | Override default values for target groups. See workers_group_defaults_defaults in locals.tf for valid keys. | map | `{}` | no | | workers\_group\_launch\_template\_defaults | Override default values for target groups. See workers_group_defaults_defaults in locals.tf for valid keys. | map | `{}` | no | +| write\_aws\_auth\_config | Whether to write the aws-auth configmap file. | string | `"true"` | no | | write\_kubeconfig | Whether to write a Kubectl config file containing the cluster configuration. Saved to `config_output_path`. | string | `"true"` | no | ## Outputs diff --git a/aws_auth.tf b/aws_auth.tf index 34d14c8caf..abe8d0766f 100644 --- a/aws_auth.tf +++ b/aws_auth.tf @@ -1,20 +1,32 @@ resource "local_file" "config_map_aws_auth" { content = "${data.template_file.config_map_aws_auth.rendered}" filename = "${var.config_output_path}config-map-aws-auth_${var.cluster_name}.yaml" - count = "${var.manage_aws_auth ? 1 : 0}" + count = "${var.write_aws_auth_config ? 1 : 0}" } resource "null_resource" "update_config_map_aws_auth" { depends_on = ["aws_eks_cluster.this"] provisioner "local-exec" { - command = "for i in `seq 1 10`; do kubectl apply -f ${var.config_output_path}config-map-aws-auth_${var.cluster_name}.yaml --kubeconfig ${var.config_output_path}kubeconfig_${var.cluster_name} && exit 0 || sleep 10; done; exit 1" + working_dir = "${path.module}" + + command = < kube_config.yaml & \ +echo "${null_resource.update_config_map_aws_auth.triggers.config_map_rendered}" > aws_auth_configmap.yaml & \ +kubectl apply -f aws_auth_configmap.yaml --kubeconfig kube_config.yaml && break || \ +sleep 10; \ +done; \ +rm aws_auth_configmap.yaml kube_config.yaml; +EOS + interpreter = ["${var.local_exec_interpreter}"] } triggers { - config_map_rendered = "${data.template_file.config_map_aws_auth.rendered}" - endpoint = "${aws_eks_cluster.this.endpoint}" + kube_config_map_rendered = "${data.template_file.kubeconfig.rendered}" + config_map_rendered = "${data.template_file.config_map_aws_auth.rendered}" + endpoint = "${aws_eks_cluster.this.endpoint}" } count = "${var.manage_aws_auth ? 1 : 0}" diff --git a/variables.tf b/variables.tf index e1208f0e9b..bf1bcaf578 100644 --- a/variables.tf +++ b/variables.tf @@ -23,7 +23,12 @@ variable "write_kubeconfig" { } variable "manage_aws_auth" { - description = "Whether to write and apply the aws-auth configmap file." + description = "Whether to apply the aws-auth configmap file." + default = true +} + +variable "write_aws_auth_config" { + description = "Whether to write the aws-auth configmap file." default = true }