Skip to content

fix: Create EKS Auto Mode role when Auto Mode is enabled, regardless of built-in node pool use #3234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2024
Merged

fix: Create EKS Auto Mode role when Auto Mode is enabled, regardless of built-in node pool use #3234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bad85bf
fix: Create EKS Auto Mode role when Auto Mode is enabled, regardless …
bryantbiggs Dec 8, 2024
bf9121f
chore: Update Karpenter example to simplify
bryantbiggs Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions examples/karpenter/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,6 @@ module "eks" {
min_size = 2
max_size = 3
desired_size = 2

taints = {
# This Taint aims to keep just EKS Addons and Karpenter running on this MNG
# The pods that do not tolerate this taint should run on nodes created by Karpenter
addons = {
key = "CriticalAddonsOnly"
value = "true"
effect = "NO_SCHEDULE"
},
}
}
}

Expand Down Expand Up @@ -164,17 +154,18 @@ resource "helm_release" "karpenter" {
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
chart = "karpenter"
version = "1.0.6"
version = "1.1.0"
wait = false

values = [
<<-EOT
serviceAccount:
name: ${module.karpenter.service_account}
dnsPolicy: Default
settings:
clusterName: ${module.eks.cluster_name}
clusterEndpoint: ${module.eks.cluster_endpoint}
interruptionQueue: ${module.karpenter.queue_name}
webhook:
enabled: false
EOT
]
}
Expand Down Expand Up @@ -226,7 +217,7 @@ resource "kubectl_manifest" "karpenter_node_pool" {
values: ["nitro"]
- key: "karpenter.k8s.aws/instance-generation"
operator: Gt
values: ["2"]
values: ["5"]
limits:
cpu: 1000
disruption:
Expand Down
23 changes: 14 additions & 9 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
data "aws_partition" "current" {}
data "aws_caller_identity" "current" {}
data "aws_partition" "current" {
count = local.create ? 1 : 0
}
data "aws_caller_identity" "current" {
count = local.create ? 1 : 0
}

data "aws_iam_session_context" "current" {
count = local.create ? 1 : 0

# This data source provides information on the IAM source role of an STS assumed role
# For non-role ARNs, this data source simply passes the ARN through issuer ARN
# Ref https://github.com/terraform-aws-modules/terraform-aws-eks/issues/2327#issuecomment-1355581682
# Ref https://github.com/hashicorp/terraform-provider-aws/issues/28381
arn = data.aws_caller_identity.current.arn
arn = try(data.aws_caller_identity.current[0].arn, "")
}

locals {
create = var.create && var.putin_khuylo

partition = data.aws_partition.current.partition
partition = try(data.aws_partition.current[0].partition, "")

cluster_role = try(aws_iam_role.this[0].arn, var.iam_role_arn)

create_outposts_local_cluster = length(var.outpost_config) > 0
enable_cluster_encryption_config = length(var.cluster_encryption_config) > 0 && !local.create_outposts_local_cluster

auto_mode_enabled = try(var.cluster_compute_config.enabled, false)
auto_mode_nodepools_enabled = length(try(var.cluster_compute_config.node_pools, [])) > 0
auto_mode_enabled = try(var.cluster_compute_config.enabled, false)
}

################################################################################
Expand Down Expand Up @@ -218,7 +223,7 @@ locals {
# better controlled by users through Terraform
bootstrap_cluster_creator_admin_permissions = {
cluster_creator = {
principal_arn = data.aws_iam_session_context.current.issuer_arn
principal_arn = try(data.aws_iam_session_context.current[0].issuer_arn, "")
type = "STANDARD"

policy_associations = {
Expand Down Expand Up @@ -307,7 +312,7 @@ module "kms" {
# Policy
enable_default_policy = var.kms_key_enable_default_policy
key_owners = var.kms_key_owners
key_administrators = coalescelist(var.kms_key_administrators, [data.aws_iam_session_context.current.issuer_arn])
key_administrators = coalescelist(var.kms_key_administrators, [try(data.aws_iam_session_context.current[0].issuer_arn, "")])
key_users = concat([local.cluster_role], var.kms_key_users)
key_service_users = var.kms_key_service_users
source_policy_documents = var.kms_key_source_policy_documents
Expand Down Expand Up @@ -689,7 +694,7 @@ resource "aws_eks_identity_provider_config" "this" {
################################################################################

locals {
create_node_iam_role = local.create && var.create_node_iam_role && local.auto_mode_nodepools_enabled
create_node_iam_role = local.create && var.create_node_iam_role && local.auto_mode_enabled
node_iam_role_name = coalesce(var.node_iam_role_name, "${var.cluster_name}-eks-auto")

create_node_iam_role_custom_policy = local.create_node_iam_role && (var.enable_node_custom_tags_permissions || length(var.node_iam_role_policy_statements) > 0)
Expand Down
Loading