From a3016e4a91d019b75f56a24b2b47e0fa261470e7 Mon Sep 17 00:00:00 2001
From: Delong Yang <delong.yang@census.gov>
Date: Wed, 16 Apr 2025 17:01:44 -0400
Subject: [PATCH] Clean up unused variables and values (#20)

* Add module release process (#19)

* add startup taint

* add namespace and startup taint to template

* templatlize

* fix vals

* fewer things

* add a few missing values

* create ns

* update values

* add nodeSelector and tolerations

* remove digest

* node group

* fmt

* syntax and startupTaints

* fix syntax

* update values

* remove ng selector

* lower cpu requests

* use digest again

* simplify repository

* fix repository

* escape the .

* fix subnets_name

* subnet selector

* use the outputs from karpenter module

* create instance profile true

* cleanup

* without cluster tag

* pass in vpc

* enable debug and disable serviceMonitor

* fix merge issues

* update resources and set eksControlPlane true

* try enable_pod_identity

* update updated upstream

* more options for namings

* shorter

* validate role name length

* validate event rules name length

* shorter

* shorter still

* fix prefix

* name the queue

* 66 - 3 = 63, limit 64

* longest event name is InstanceStateChange

* another

* maybe

* name

* name_prefix

* or_not

* add module release process

* update module source

* update release actions

* Comment out unused values

* Comment out vpc_id variable definition

* Disable IRSA

---------

Co-authored-by: Matthew Creal Morgan <matthew.c.morgan@census.gov>
---
 karpenter-resources/values.yaml.tpl |  1 -
 karpenter/values.yaml.tpl           | 19 +++++++++++++------
 main.tf                             |  5 +----
 variables.tf                        |  5 -----
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/karpenter-resources/values.yaml.tpl b/karpenter-resources/values.yaml.tpl
index 747ba17..c4004b1 100644
--- a/karpenter-resources/values.yaml.tpl
+++ b/karpenter-resources/values.yaml.tpl
@@ -8,7 +8,6 @@ ec2NodeClass:
   amiFamily: ${amd_ami_family}
   amiSelectorTerms:
     - alias: ${amd_ami_alias}
-  vpcId: ${vpc_id}
   subnetSelectorTerms:
     - tags:
         Name: "${subnets_name}"
diff --git a/karpenter/values.yaml.tpl b/karpenter/values.yaml.tpl
index 3228846..85d46b9 100644
--- a/karpenter/values.yaml.tpl
+++ b/karpenter/values.yaml.tpl
@@ -34,12 +34,19 @@ controller:
   env:
     - name: AWS_REGION
       value: ${region}
-  nodeSelector:
-    kubernetes.io/os: linux
-  tolerations:
-    - key: "node-role.kubernetes.io/control-plane"
-      operator: "Exists"
-      effect: "NoSchedule"
+
+nodeSelector:
+  kubernetes.io/os: linux
+
+tolerations:
+  - key: CriticalAddonsOnly
+    operator: Exists
+  - key: node-role.kubernetes.io/master
+    operator: Exists
+    effect: NoSchedule
+  - key: node-role.kubernetes.io/control-plane
+    operator: Exists
+    effect: NoSchedule
 
 nodeSelector:
   kubernetes.io/os: linux
diff --git a/main.tf b/main.tf
index 90b9b03..72d4e74 100644
--- a/main.tf
+++ b/main.tf
@@ -28,11 +28,9 @@ module "karpenter_resources" {
   create_instance_profile         = true
   create_node_iam_role            = true
   create_pod_identity_association = true
-  enable_irsa                     = true
+  enable_irsa                     = false
   enable_pod_identity             = true
   enable_v1_permissions           = true
-  irsa_namespace_service_accounts = ["${var.namespace}:karpenter"]
-  irsa_oidc_provider_arn          = var.oidc_provider_arn
   node_iam_role_name              = local.node_iam_role_name
   queue_name                      = local.queue_name
   rule_name_prefix                = local.rule_name_prefix
@@ -104,7 +102,6 @@ resource "helm_release" "nodepool_resources" {
       karpenter_node_profile = module.karpenter_resources.instance_profile_name
       subnets_name           = var.subnets_name
       tags                   = var.tags
-      vpc_id                 = var.vpc_id
     })
   ]
 }
diff --git a/variables.tf b/variables.tf
index dc6a19b..435897c 100644
--- a/variables.tf
+++ b/variables.tf
@@ -71,8 +71,3 @@ variable "tags" {
   type        = map(string)
   default     = {}
 }
-
-variable "vpc_id" {
-  description = "The ID of the VPC where the resources will be deployed"
-  type        = string
-}