From 04c1bb48684164fa037b10e9d2df7c658e68db27 Mon Sep 17 00:00:00 2001 From: Matthew Creal Morgan Date: Wed, 23 Apr 2025 09:43:05 -0700 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20dep-bump(main.tf):=20up?= =?UTF-8?q?date=20source=20on=20karpenter=5Fresources=20to=20v20.36.0=20(#?= =?UTF-8?q?22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * pull from ent-ecr * 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 * use eecr images * pull across accounts from central ecr * pull across accounts from central ecr * add irsa back * remove dupes from bad merge * dynamic version * remove eecr data item as it is in the provider * update copy images for eecr pulling * update var and ent_ecr_source * ensure workflows are current * ensure workflows are current * ensure committed * ⬆️ dep-bump(main.tf): update source on karpenter_resources to v20.36.0 * 🐛 fix(main.tf): increase timeout and add wait on helm_release resources --------- Co-authored-by: Delong Yang --- README.md | 2 +- main.tf | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index aaae1a6..b8dcb78 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the | Name | Source | Version | |------|--------|---------| | [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade | -| [karpenter\_resources](#module\_karpenter\_resources) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.35.0 | +| [karpenter\_resources](#module\_karpenter\_resources) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.36.0 | ## Resources diff --git a/main.tf b/main.tf index c4f1a05..3175de1 100644 --- a/main.tf +++ b/main.tf @@ -21,7 +21,7 @@ locals { # Replicating from here: https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks/tree/master/modules/karpenter # Karpenter IRSA roles and policies module "karpenter_resources" { - source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter?ref=v20.35.0" + source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter?ref=v20.36.0" cluster_name = var.cluster_name create_access_entry = true @@ -83,7 +83,8 @@ resource "helm_release" "karpenter" { }) ] - timeout = 300 + timeout = 600 + wait = true } resource "helm_release" "nodepool_resources" { @@ -106,4 +107,7 @@ resource "helm_release" "nodepool_resources" { tags = var.tags }) ] + + timeout = 600 + wait = true }