From bcbf1e392c9639947eb92b8141db898e5b14d81e Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 26 Jul 2024 19:58:43 -0400 Subject: [PATCH] add node_group_name as output --- main.tf | 22 +--------------------- outputs.tf | 7 +++++-- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/main.tf b/main.tf index 6f24f57..c75314b 100644 --- a/main.tf +++ b/main.tf @@ -114,7 +114,7 @@ module "cluster" { } eks_managed_node_group_defaults = { - ami_type = "AL2023_x86_64_STANDARD" + ami_type = "aws-k8s-1.30" } node_security_group_enable_recommended_rules = true @@ -149,15 +149,6 @@ module "cluster" { } } } - # 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" - # }, - # } } } @@ -185,14 +176,3 @@ resource "null_resource" "kube_config_create" { command = "aws eks --region ${data.aws_region.current.name} update-kubeconfig --name ${module.cluster.cluster_name} --profile=${var.profile} && export KUBE_CONFIG_PATH=~/.kube/config && export KUBERNETES_MASTER=~/.kube/config" } } - - -# resource "kubernetes_namespace" "operators" { -# depends_on = [ -# module.cluster.eks_managed_node_groups, -# ] - -# metadata { -# name = var.operators_ns -# } -# } diff --git a/outputs.tf b/outputs.tf index a17cf6b..83f2345 100644 --- a/outputs.tf +++ b/outputs.tf @@ -277,6 +277,9 @@ output "self_managed_node_groups_autoscaling_group_names" { ################################################################################ # Additional ################################################################################ -output "cluster_autoscaler_role_name" { - value = module.cluster_autoscaler_irsa_role.iam_role_name +# output "cluster_autoscaler_role_name" { +# value = module.cluster_autoscaler_irsa_role.iam_role_name +# } +output "node_group_name" { + value = local.ng_name }