From f5e9ed6d85bc090ba347bd23c7b2b16b9f07b613 Mon Sep 17 00:00:00 2001 From: Rodrigo Bersa Date: Sun, 9 Jun 2024 18:48:53 -0400 Subject: [PATCH] Pre-commit --- README.md | 4 +++- main.tf | 6 +++--- tests/complete/main.tf | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6044a5df..76f4aa7e 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ module "eks" { | [external\_secrets](#module\_external\_secrets) | aws-ia/eks-blueprints-addon/aws | 1.1.1 | | [gatekeeper](#module\_gatekeeper) | aws-ia/eks-blueprints-addon/aws | 1.1.1 | | [ingress\_nginx](#module\_ingress\_nginx) | aws-ia/eks-blueprints-addon/aws | 1.1.1 | -| [karpenter](#module\_karpenter) | aws-ia/eks-blueprints-addon/aws | 1.1.1 | +| [karpenter](#module\_karpenter) | ../terraform-aws-eks-blueprints-addon | n/a | | [karpenter\_sqs](#module\_karpenter\_sqs) | terraform-aws-modules/sqs/aws | 4.0.1 | | [kube\_prometheus\_stack](#module\_kube\_prometheus\_stack) | aws-ia/eks-blueprints-addon/aws | 1.1.1 | | [metrics\_server](#module\_metrics\_server) | aws-ia/eks-blueprints-addon/aws | 1.1.1 | @@ -120,6 +120,7 @@ module "eks" { | [aws_cloudwatch_event_target.karpenter](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_target) | resource | | [aws_cloudwatch_log_group.aws_for_fluentbit](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource | | [aws_cloudwatch_log_group.fargate_fluentbit](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource | +| [aws_eks_access_entry.node](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_access_entry) | resource | | [aws_eks_addon.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource | | [aws_iam_instance_profile.karpenter](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_instance_profile) | resource | | [aws_iam_policy.fargate_fluentbit](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource | @@ -225,6 +226,7 @@ module "eks" { | [helm\_releases](#input\_helm\_releases) | A map of Helm releases to create. This provides the ability to pass in an arbitrary map of Helm chart definitions to create | `any` | `{}` | no | | [ingress\_nginx](#input\_ingress\_nginx) | Ingress Nginx add-on configurations | `any` | `{}` | no | | [karpenter](#input\_karpenter) | Karpenter add-on configuration values | `any` | `{}` | no | +| [karpenter\_create\_access\_entry](#input\_karpenter\_create\_access\_entry) | Determines whether to create Karpenter Access Entry for Cluster Access Management API. | `bool` | `false` | no | | [karpenter\_enable\_instance\_profile\_creation](#input\_karpenter\_enable\_instance\_profile\_creation) | Determines whether Karpenter will be allowed to create the IAM instance profile (v1beta1) or if Terraform will (v1alpha1) | `bool` | `true` | no | | [karpenter\_enable\_spot\_termination](#input\_karpenter\_enable\_spot\_termination) | Determines whether to enable native node termination handling | `bool` | `true` | no | | [karpenter\_node](#input\_karpenter\_node) | Karpenter IAM role and IAM instance profile configuration values | `any` | `{}` | no | diff --git a/main.tf b/main.tf index 6b5a9e3b..21400aa4 100644 --- a/main.tf +++ b/main.tf @@ -3096,14 +3096,14 @@ module "karpenter" { policy_name_use_prefix = try(var.karpenter.policy_name_use_prefix, true) policy_path = try(var.karpenter.policy_path, null) policy_description = try(var.karpenter.policy_description, "IAM Policy for karpenter") - + oidc_providers = { this = { provider_arn = local.oidc_provider_arn # namespace is inherited from chart service_account = local.karpenter_service_account_name - } - } + } + } tags = var.tags } diff --git a/tests/complete/main.tf b/tests/complete/main.tf index b79540bf..2529fe6b 100644 --- a/tests/complete/main.tf +++ b/tests/complete/main.tf @@ -81,7 +81,7 @@ module "eks_blueprints_addons" { vpc-cni = { most_recent = true } - kube-proxy = {} + kube-proxy = {} eks-pod-identity-agent = {} adot = { most_recent = true @@ -164,7 +164,7 @@ module "eks_blueprints_addons" { enable_karpenter = true karpenter_enable_instance_profile_creation = true karpenter_create_access_entry = true - karpenter = { + karpenter = { enable_pod_identity = true create_pod_identity_association = true # ECR login required @@ -307,7 +307,7 @@ module "vpc" { private_subnet_tags = { "kubernetes.io/role/internal-elb" = 1 - "karpenter.sh/discovery" = local.name + "karpenter.sh/discovery" = local.name } tags = local.tags