diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f615fef..f0000fb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: detect-aws-credentials args: ['--allow-missing-credentials'] - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.74.1 + rev: v1.76.0 hooks: - id: terraform_fmt - id: terraform_docs diff --git a/README.md b/README.md index 1d2b72d..7904024 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ If you are interested in contributing to EKS Blueprints, see the [Contribution g | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.1.0 | | [aws](#requirement\_aws) | >= 4.0.0 | | [awscc](#requirement\_awscc) | >= 0.24.0 | | [grafana](#requirement\_grafana) | 1.25.0 | diff --git a/examples/eks-cluster-with-vpc/main.tf b/examples/eks-cluster-with-vpc/main.tf index 2b4cc99..11c4c2b 100644 --- a/examples/eks-cluster-with-vpc/main.tf +++ b/examples/eks-cluster-with-vpc/main.tf @@ -41,7 +41,7 @@ locals { #--------------------------------------------------------------- module "eks_blueprints" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.8.1" + source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.13.1" cluster_name = local.cluster_name cluster_version = "1.23" @@ -62,7 +62,7 @@ module "eks_blueprints" { } module "eks_blueprints_kubernetes_addons" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.8.1" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.13.1" eks_cluster_id = module.eks_blueprints.eks_cluster_id eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint diff --git a/examples/eks-cluster-with-vpc/versions.tf b/examples/eks-cluster-with-vpc/versions.tf index 0513174..e1bdf68 100644 --- a/examples/eks-cluster-with-vpc/versions.tf +++ b/examples/eks-cluster-with-vpc/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = { diff --git a/examples/existing-cluster-java/README.md b/examples/existing-cluster-java/README.md index 52d83a0..9dcb47e 100644 --- a/examples/existing-cluster-java/README.md +++ b/examples/existing-cluster-java/README.md @@ -190,7 +190,7 @@ terraform destroy -var-file=terraform.tfvars | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.1.0 | | [aws](#requirement\_aws) | >= 4.0.0 | | [grafana](#requirement\_grafana) | >= 1.25.0 | | [helm](#requirement\_helm) | >= 2.4.1 | diff --git a/examples/existing-cluster-java/versions.tf b/examples/existing-cluster-java/versions.tf index e5bf819..0633fb7 100644 --- a/examples/existing-cluster-java/versions.tf +++ b/examples/existing-cluster-java/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = { diff --git a/examples/existing-cluster-nginx/README.md b/examples/existing-cluster-nginx/README.md index 8cdc445..c3c364e 100644 --- a/examples/existing-cluster-nginx/README.md +++ b/examples/existing-cluster-nginx/README.md @@ -191,7 +191,7 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.1.0 | | [aws](#requirement\_aws) | >= 4.0.0 | | [grafana](#requirement\_grafana) | >= 1.25.0 | | [helm](#requirement\_helm) | >= 2.4.1 | diff --git a/examples/existing-cluster-nginx/versions.tf b/examples/existing-cluster-nginx/versions.tf index e5bf819..0633fb7 100644 --- a/examples/existing-cluster-nginx/versions.tf +++ b/examples/existing-cluster-nginx/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = { diff --git a/examples/existing-cluster-with-base-and-infra/README.md b/examples/existing-cluster-with-base-and-infra/README.md index 4a80f3c..3268d55 100644 --- a/examples/existing-cluster-with-base-and-infra/README.md +++ b/examples/existing-cluster-with-base-and-infra/README.md @@ -142,7 +142,7 @@ terraform destroy -var-file=terraform.tfvars | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.1.0 | | [aws](#requirement\_aws) | >= 4.0.0 | | [grafana](#requirement\_grafana) | >= 1.25.0 | | [helm](#requirement\_helm) | >= 2.4.1 | diff --git a/examples/existing-cluster-with-base-and-infra/versions.tf b/examples/existing-cluster-with-base-and-infra/versions.tf index e5bf819..0633fb7 100644 --- a/examples/existing-cluster-with-base-and-infra/versions.tf +++ b/examples/existing-cluster-with-base-and-infra/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = { diff --git a/modules/add-ons/adot-operator/README.md b/modules/add-ons/adot-operator/README.md index bd2e699..92892b8 100644 --- a/modules/add-ons/adot-operator/README.md +++ b/modules/add-ons/adot-operator/README.md @@ -26,7 +26,7 @@ the ADOT Operator. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.1.0 | | [aws](#requirement\_aws) | >= 3.72 | | [kubernetes](#requirement\_kubernetes) | >= 2.10 | @@ -41,7 +41,7 @@ the ADOT Operator. | Name | Source | Version | |------|--------|---------| -| [cert\_manager](#module\_cert\_manager) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager | v4.8.1 | +| [cert\_manager](#module\_cert\_manager) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager | v4.13.1 | ## Resources @@ -60,7 +60,7 @@ the ADOT Operator. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [addon\_config](#input\_addon\_config) | Amazon EKS Managed CoreDNS Add-on config | `any` | `{}` | no | -| [addon\_context](#input\_addon\_context) | Input configuration for the addon |
object({
aws_caller_identity_account_id = string
aws_caller_identity_arn = string
aws_eks_cluster_endpoint = string
aws_partition_id = string
aws_region_name = string
eks_cluster_id = string
eks_oidc_issuer_url = string
eks_oidc_provider_arn = string
irsa_iam_role_path = string
tags = map(string)
})
| n/a | yes | +| [addon\_context](#input\_addon\_context) | Input configuration for the addon |
object({
aws_caller_identity_account_id = string
aws_caller_identity_arn = string
aws_eks_cluster_endpoint = string
aws_partition_id = string
aws_region_name = string
eks_cluster_id = string
eks_oidc_issuer_url = string
eks_oidc_provider_arn = string
irsa_iam_role_path = string
irsa_iam_permissions_boundary = string
tags = map(string)
})
| n/a | yes | | [enable\_cert\_manager](#input\_enable\_cert\_manager) | Enable cert-manager, a requirement for ADOT Operator | `bool` | `true` | no | | [helm\_config](#input\_helm\_config) | Helm provider config for ADOT Operator AddOn | `any` |
{
"version": "v1.8.2"
}
| no | | [kubernetes\_version](#input\_kubernetes\_version) | EKS Cluster version | `string` | n/a | yes | diff --git a/modules/add-ons/adot-operator/main.tf b/modules/add-ons/adot-operator/main.tf index 71a3ca8..041f74c 100644 --- a/modules/add-ons/adot-operator/main.tf +++ b/modules/add-ons/adot-operator/main.tf @@ -1,5 +1,5 @@ module "cert_manager" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager?ref=v4.8.1" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/cert-manager?ref=v4.13.1" count = var.enable_cert_manager ? 1 : 0 helm_config = var.helm_config diff --git a/modules/add-ons/adot-operator/variables.tf b/modules/add-ons/adot-operator/variables.tf index 105d8e4..e052766 100644 --- a/modules/add-ons/adot-operator/variables.tf +++ b/modules/add-ons/adot-operator/variables.tf @@ -16,6 +16,7 @@ variable "addon_context" { eks_oidc_issuer_url = string eks_oidc_provider_arn = string irsa_iam_role_path = string + irsa_iam_permissions_boundary = string tags = map(string) }) } diff --git a/modules/add-ons/adot-operator/versions.tf b/modules/add-ons/adot-operator/versions.tf index ef15df6..e257f04 100644 --- a/modules/add-ons/adot-operator/versions.tf +++ b/modules/add-ons/adot-operator/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = { diff --git a/modules/workloads/infra/README.md b/modules/workloads/infra/README.md index bfdea8a..fabd4d6 100644 --- a/modules/workloads/infra/README.md +++ b/modules/workloads/infra/README.md @@ -13,7 +13,7 @@ This module is inspired from the open source [kube-prometheus-stack](https://git | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.1.0 | | [aws](#requirement\_aws) | >= 4.0.0 | | [grafana](#requirement\_grafana) | >= 1.25.0 | | [helm](#requirement\_helm) | >= 2.4.1 | @@ -32,7 +32,7 @@ This module is inspired from the open source [kube-prometheus-stack](https://git | Name | Source | Version | |------|--------|---------| -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.8.1 | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.13.1 | ## Resources diff --git a/modules/workloads/infra/main.tf b/modules/workloads/infra/main.tf index c1f1ab0..7b5ec1f 100644 --- a/modules/workloads/infra/main.tf +++ b/modules/workloads/infra/main.tf @@ -35,7 +35,7 @@ resource "helm_release" "prometheus_node_exporter" { } module "helm_addon" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.8.1" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.13.1" helm_config = merge( { diff --git a/modules/workloads/infra/versions.tf b/modules/workloads/infra/versions.tf index 8283555..595fb3e 100644 --- a/modules/workloads/infra/versions.tf +++ b/modules/workloads/infra/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = { diff --git a/modules/workloads/java/README.md b/modules/workloads/java/README.md index 9f0c5c3..b7dd257 100644 --- a/modules/workloads/java/README.md +++ b/modules/workloads/java/README.md @@ -11,7 +11,7 @@ This module provides monitoring for Java based workloads with the following reso | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.1.0 | | [aws](#requirement\_aws) | >= 4.0.0 | | [grafana](#requirement\_grafana) | >= 1.25.0 | | [helm](#requirement\_helm) | >= 2.4.1 | @@ -29,7 +29,7 @@ This module provides monitoring for Java based workloads with the following reso | Name | Source | Version | |------|--------|---------| -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.12.1 | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.13.1 | ## Resources diff --git a/modules/workloads/java/main.tf b/modules/workloads/java/main.tf index 0b63fcc..5f14027 100644 --- a/modules/workloads/java/main.tf +++ b/modules/workloads/java/main.tf @@ -1,6 +1,6 @@ # deploys collector module "helm_addon" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.12.1" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.13.1" helm_config = merge( { diff --git a/modules/workloads/java/versions.tf b/modules/workloads/java/versions.tf index 8283555..595fb3e 100644 --- a/modules/workloads/java/versions.tf +++ b/modules/workloads/java/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = { diff --git a/modules/workloads/nginx/README.md b/modules/workloads/nginx/README.md index 67a9ac6..a5732c6 100644 --- a/modules/workloads/nginx/README.md +++ b/modules/workloads/nginx/README.md @@ -12,7 +12,7 @@ It provides the following resources: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 | +| [terraform](#requirement\_terraform) | >= 1.1.0 | | [aws](#requirement\_aws) | >= 4.0.0 | | [grafana](#requirement\_grafana) | >= 1.25.0 | | [kubernetes](#requirement\_kubernetes) | >= 2.10 | @@ -28,7 +28,7 @@ It provides the following resources: | Name | Source | Version | |------|--------|---------| -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.9.0 | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.13.1 | ## Resources diff --git a/modules/workloads/nginx/main.tf b/modules/workloads/nginx/main.tf index b4099e7..915badd 100644 --- a/modules/workloads/nginx/main.tf +++ b/modules/workloads/nginx/main.tf @@ -1,5 +1,5 @@ module "helm_addon" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.9.0" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.13.1" helm_config = merge( { diff --git a/modules/workloads/nginx/versions.tf b/modules/workloads/nginx/versions.tf index 3d27127..6f2635a 100644 --- a/modules/workloads/nginx/versions.tf +++ b/modules/workloads/nginx/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = { diff --git a/versions.tf b/versions.tf index a9cd4d0..b0fc4d6 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.1.0, < 1.3.0" + required_version = ">= 1.1.0" required_providers { aws = {