diff --git a/README.md b/README.md index e5b90d2..4a2077e 100644 --- a/README.md +++ b/README.md @@ -4,37 +4,34 @@ This module deploys [AWS LoadBalancer Controller](https://kubernetes-sigs.github.io/aws-load-balancer-controller) to a Kubernetes Cluster. + ## Requirements | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.14 | -| [aws](#requirement\_aws) | >= 3.28 | -| [helm](#requirement\_helm) | >= 2 | -| [http](#requirement\_http) | >= 2.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | +| [helm](#requirement\_helm) | >= 2.2 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.28 | -| [helm](#provider\_helm) | >= 2 | -| [http](#provider\_http) | >= 2.1 | +| [aws](#provider\_aws) | >= 4.0 | +| [helm](#provider\_helm) | >= 2.2 | ## Modules | Name | Source | Version | |------|--------|---------| -| [iam\_assumable\_role\_admin](#module\_iam\_assumable\_role\_admin) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 | +| [lb\_controller\_role](#module\_lb\_controller\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 4.21.1 | ## Resources | Name | Type | |------|------| -| [aws_iam_role_policy.controller](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource | | [helm_release.release](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | | [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source | -| [http_http.iam_policy](https://registry.terraform.io/providers/hashicorp/http/latest/docs/data-sources/http) | data source | ## Inputs @@ -46,9 +43,9 @@ to a Kubernetes Cluster. | [chart\_namespace](#input\_chart\_namespace) | Namespace to install the chart into | `string` | `"kube-system"` | no | | [chart\_repository](#input\_chart\_repository) | Helm repository for the chart | `string` | `"https://aws.github.io/eks-charts"` | no | | [chart\_timeout](#input\_chart\_timeout) | Timeout to wait for the Chart to be deployed. | `number` | `300` | no | -| [chart\_version](#input\_chart\_version) | Version of Chart to install. Set to empty to install the latest version | `string` | `"1.3.2"` | no | +| [chart\_version](#input\_chart\_version) | Version of Chart to install. Set to empty to install the latest version | `string` | `"1.4.4"` | no | | [cluster\_name](#input\_cluster\_name) | Name of Kubernetes Cluster | `string` | n/a | yes | -| [cluster\_oidc\_issuer\_url](#input\_cluster\_oidc\_issuer\_url) | OIDC provider URL for EKS cluster | `string` | n/a | yes | +| [cluster\_tag\_check](#input\_cluster\_tag\_check) | Enable or disable subnet tag check | `bool` | `false` | no | | [default\_tags](#input\_default\_tags) | Default tags to apply to all AWS resources managed by this controller | `map(string)` | `{}` | no | | [enable\_cert\_manager](#input\_enable\_cert\_manager) | Enable cert-manager injection of webhook certficates | `bool` | `false` | no | | [enable\_pod\_readiness\_gate\_inject](#input\_enable\_pod\_readiness\_gate\_inject) | If enabled, targetHealth readiness gate will get injected to the pod spec for the matching endpoint pods (default true) | `bool` | `true` | no | @@ -60,20 +57,16 @@ to a Kubernetes Cluster. | [extra\_volumes](#input\_extra\_volumes) | Extra volumes | `list(any)` | `[]` | no | | [fullname\_override](#input\_fullname\_override) | Full name override for resources | `string` | `""` | no | | [host\_network](#input\_host\_network) | Use Host Network for pod | `bool` | `false` | no | -| [iam\_role\_description](#input\_iam\_role\_description) | Description for IAM role for controller | `string` | `"Used by AWS Load Balancer Controller for EKS"` | no | -| [iam\_role\_name](#input\_iam\_role\_name) | Name of IAM role for controller | `string` | `"aws-load-balancer-controller"` | no | -| [iam\_role\_path](#input\_iam\_role\_path) | IAM Role path for controller | `string` | `""` | no | -| [iam\_role\_permission\_boundary](#input\_iam\_role\_permission\_boundary) | Permission boundary ARN for IAM Role for controller | `string` | `""` | no | -| [iam\_role\_policy](#input\_iam\_role\_policy) | Override the IAM policy for the controller | `string` | `""` | no | -| [iam\_role\_tags](#input\_iam\_role\_tags) | Tags for IAM Role for controller | `map(string)` | `{}` | no | +| [iam\_role\_name](#input\_iam\_role\_name) | Name of IAM role for controller | `string` | `""` | no | | [image\_repository](#input\_image\_repository) | Image repository on Dockerhub | `string` | `"amazon/aws-alb-ingress-controller"` | no | -| [image\_tag](#input\_image\_tag) | Image tag | `string` | `"v2.3.0"` | no | +| [image\_tag](#input\_image\_tag) | Image tag | `string` | `"v2.4.3"` | no | | [ingress\_class](#input\_ingress\_class) | The ingress class this controller will satisfy. If not specified, controller will match all ingresses without ingress class annotation and ingresses of type alb | `string` | `"alb"` | no | | [ingress\_max\_concurrent\_reconciles](#input\_ingress\_max\_concurrent\_reconciles) | Maximum number of concurrently running reconcile loops for ingress (default 3) | `number` | `3` | no | | [log\_level](#input\_log\_level) | Log level. Either `info` or `debug` | `string` | `"info"` | no | | [max\_history](#input\_max\_history) | Max History for Helm | `number` | `20` | no | | [metrics\_bind\_addr](#input\_metrics\_bind\_addr) | The address the metric endpoint binds to. (default ':8080') | `string` | `":8080"` | no | | [name\_override](#input\_name\_override) | Name override for resources | `string` | `""` | no | +| [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | OIDC Provider ARN for IRSA | `string` | n/a | yes | | [pdb](#input\_pdb) | PDB for pod | `map(any)` | `{}` | no | | [pod\_annotations](#input\_pod\_annotations) | Additional annotations on a pod | `map(string)` | `{}` | no | | [pod\_labels](#input\_pod\_labels) | Additional labels on a pod | `map(string)` | `{}` | no | @@ -104,3 +97,4 @@ to a Kubernetes Cluster. | [iam\_role\_name](#output\_iam\_role\_name) | Name of IAM role | | [iam\_role\_path](#output\_iam\_role\_path) | Path of IAM role | | [iam\_role\_unique\_id](#output\_iam\_role\_unique\_id) | Unique ID of IAM role | + diff --git a/main.tf b/main.tf index da450c6..740b832 100644 --- a/main.tf +++ b/main.tf @@ -42,6 +42,7 @@ locals { enable_cert_manager = var.enable_cert_manager cluster_name = var.cluster_name + cluster_tag_check = var.cluster_tag_check ingress_class = var.ingress_class region = var.region vpc_id = var.vpc_id diff --git a/templates/values.yaml b/templates/values.yaml index e08204d..27e77aa 100644 --- a/templates/values.yaml +++ b/templates/values.yaml @@ -16,6 +16,8 @@ fullnameOverride: "${fullname_override}" # The name of the Kubernetes cluster. A non-empty value is required clusterName: ${cluster_name} +SubnetsClusterTagCheck: ${cluster_tag_check} + serviceAccount: # Specifies whether a service account should be created create: true diff --git a/variables.tf b/variables.tf index e732eb0..9fb8427 100644 --- a/variables.tf +++ b/variables.tf @@ -19,7 +19,7 @@ variable "chart_repository" { variable "chart_version" { description = "Version of Chart to install. Set to empty to install the latest version" type = string - default = "1.3.2" + default = "1.4.4" } variable "chart_namespace" { @@ -64,7 +64,7 @@ variable "prefer_ecr_repositories" { variable "image_tag" { description = "Image tag" type = string - default = "v2.3.0" + default = "v2.4.3" } variable "name_override" { @@ -204,6 +204,12 @@ variable "cluster_name" { type = string } +variable "cluster_tag_check" { + description = "Enable or disable subnet tag check" + type = bool + default = false +} + variable "ingress_class" { description = "The ingress class this controller will satisfy. If not specified, controller will match all ingresses without ingress class annotation and ingresses of type alb" type = string @@ -319,33 +325,3 @@ variable "iam_role_name" { type = string default = "" } - -variable "iam_role_description" { - description = "Description for IAM role for controller" - type = string - default = "Used by AWS Load Balancer Controller for EKS" -} - -variable "iam_role_path" { - description = "IAM Role path for controller" - type = string - default = "" -} - -variable "iam_role_permission_boundary" { - description = "Permission boundary ARN for IAM Role for controller" - type = string - default = "" -} - -variable "iam_role_tags" { - description = "Tags for IAM Role for controller" - type = map(string) - default = {} -} - -variable "iam_role_policy" { - description = "Override the IAM policy for the controller" - type = string - default = "" -}