Skip to content
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

Jump to bottom

fix: Override karpenter instance profile name #325

Merged
merged 5 commits into from
Feb 2, 2024
Merged

fix: Override karpenter instance profile name #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87ae05b
fix: Override karpenter instance profile name
blakepettersson Dec 4, 2023
4ea3379
fix: Use `try` with `var.karpenter_node.instance_profile_name`
blakepettersson Dec 4, 2023
187c1d0
refactor: no need for coalesce
blakepettersson Dec 5, 2023
6292fed
fix: Clarify Karpenter instance profile name input (waht to name it) …
bryantbiggs Feb 2, 2024
d98f892
Merge branch 'main' into fix/override-instance-profile-name
bryantbiggs Feb 2, 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
21 changes: 12 additions & 9 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2736,11 +2736,14 @@ locals {
karpenter_service_account_name = try(var.karpenter.service_account_name, "karpenter")
karpenter_enable_spot_termination = var.enable_karpenter && var.karpenter_enable_spot_termination

create_karpenter_node_iam_role = var.enable_karpenter && try(var.karpenter_node.create_iam_role, true)
karpenter_node_iam_role_arn = try(aws_iam_role.karpenter[0].arn, var.karpenter_node.iam_role_arn, "")
karpenter_node_iam_role_name = try(var.karpenter_node.iam_role_name, "karpenter-${var.cluster_name}")
karpenter_node_instance_profile_name = try(aws_iam_instance_profile.karpenter[0].name, var.karpenter_node.instance_profile_name, "")
karpenter_namespace = try(var.karpenter.namespace, "karpenter")
create_karpenter_node_iam_role = var.enable_karpenter && try(var.karpenter_node.create_iam_role, true)
karpenter_node_iam_role_arn = try(aws_iam_role.karpenter[0].arn, var.karpenter_node.iam_role_arn, "")
karpenter_node_iam_role_name = try(var.karpenter_node.iam_role_name, "karpenter-${var.cluster_name}")
# This is the name used when the instance profile is created by the module
input_karpenter_node_instance_profile_name = try(var.karpenter_node.instance_profile_name, local.karpenter_node_iam_role_name)
# This is the name passed to the Karpenter Helm chart - either the profile the module creates, or one provided by the user
output_karpenter_node_instance_profile_name = try(aws_iam_instance_profile.karpenter[0].name, var.karpenter_node.instance_profile_name, "")
karpenter_namespace = try(var.karpenter.namespace, "karpenter")

karpenter_set = [
# TODO - remove at next breaking change
Expand All @@ -2759,7 +2762,7 @@ locals {
},
{
name = "settings.aws.defaultInstanceProfile"
value = var.karpenter_enable_instance_profile_creation ? null : local.karpenter_node_instance_profile_name
value = var.karpenter_enable_instance_profile_creation ? null : local.output_karpenter_node_instance_profile_name
},
# Post 0.32.x
{
Expand All @@ -2777,7 +2780,7 @@ locals {
# TODO - this is not valid but being discussed as a re-addition. TBD on what the schema will be though
# {
# name = "settings.defaultInstanceProfile"
# value = var.karpenter_enable_instance_profile_creation ? null : local.karpenter_node_instance_profile_name
# value = var.karpenter_enable_instance_profile_creation ? null : local.output_karpenter_node_instance_profile_name
# },
# Agnostic of version difference
{
Expand Down Expand Up @@ -2989,8 +2992,8 @@ resource "aws_iam_role_policy_attachment" "additional" {
resource "aws_iam_instance_profile" "karpenter" {
count = var.enable_karpenter && try(var.karpenter_node.create_instance_profile, true) ? 1 : 0

name = try(var.karpenter_node.iam_role_use_name_prefix, true) ? null : local.karpenter_node_iam_role_name
name_prefix = try(var.karpenter_node.iam_role_use_name_prefix, true) ? "${local.karpenter_node_iam_role_name}-" : null
name = try(var.karpenter_node.iam_role_use_name_prefix, true) ? null : local.input_karpenter_node_instance_profile_name
name_prefix = try(var.karpenter_node.iam_role_use_name_prefix, true) ? "${local.input_karpenter_node_instance_profile_name}-" : null
path = try(var.karpenter_node.iam_role_path, null)
role = try(aws_iam_role.karpenter[0].name, var.karpenter_node.iam_role_name, "")

Expand Down
2 changes: 1 addition & 1 deletion outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ output "gitops_metadata" {
namespace = local.karpenter_namespace
service_account = local.karpenter_service_account_name
sqs_queue_name = module.karpenter_sqs.queue_name
node_instance_profile_name = local.karpenter_node_instance_profile_name
node_instance_profile_name = local.output_karpenter_node_instance_profile_name
node_iam_role_name = try(aws_iam_role.karpenter[0].name, "")
} : "karpenter_${k}" => v if var.enable_karpenter
},
Expand Down
Loading