From 556e9eeda2757cdbc4831b1d94634bc968466209 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Tue, 30 Jul 2024 16:38:31 -0400 Subject: [PATCH] fmt --- README.md | 5 +++-- main.tf | 24 +++++++++++------------- outputs.tf | 5 ----- version.tf | 3 +-- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 5fb1238..bbe1d75 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ NOTE: Deploying Karpenter after deploying Istio is not recommended because it di The module deploys Karpenter needed AWS resources, namely in IAM. It copies the Karpenter controller from the public registry to local ECR, deploys Karpenter via Helm and deploys a single default Karpenter Nodepool with EC2NodeClass. # CHANGELOG - +* 0.0.2 -- 2024-07-30 + - update after removing cluster-autoscaler * 0.0.1 -- 2024-07-26 - Genesis/Initial development @@ -71,4 +72,4 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the ## Outputs No outputs. - \ No newline at end of file + diff --git a/main.tf b/main.tf index f6eadbf..94ff312 100644 --- a/main.tf +++ b/main.tf @@ -20,19 +20,18 @@ module "karpenter_resources" { } # Install Karpenter -# data "aws_ecr_image" "karpenter_image" { -# depends_on = [ -# module.images, -# ] -# repository_name = module.images.images[local.karpenter_key].dest_repository -# image_tag = module.images.images[local.karpenter_key].tag -# } +data "aws_ecr_image" "karpenter_image" { + depends_on = [ + module.images, + ] + repository_name = module.images.images[local.karpenter_key].dest_repository + image_tag = module.images.images[local.karpenter_key].tag +} resource "helm_release" "karpenter" { depends_on = [ module.images, ] - name = "karpenter" chart = "karpenter" version = var.karpenter_helm_chart @@ -92,10 +91,10 @@ resource "helm_release" "karpenter" { name = "controller.image.tag" value = module.images.images[local.karpenter_key].tag } - # set { - # name = "controller.image.digest" - # value = data.aws_ecr_image.karpenter_image.id - # } + set { + name = "controller.image.digest" + value = data.aws_ecr_image.karpenter_image.id + } set { name = "controller.env[0].name" value = "AWS_REGION" @@ -166,6 +165,5 @@ resource "kubectl_manifest" "karpenter_NodePool" { depends_on = [ kubectl_manifest.karpenter_EC2NodeClass, ] - yaml_body = templatefile("${path.module}/EC2NodePool.yaml.tpl", {}) } diff --git a/outputs.tf b/outputs.tf index f3bba7c..0349496 100644 --- a/outputs.tf +++ b/outputs.tf @@ -11,8 +11,3 @@ output "module_version" { description = "The version of this module." value = local._module_version } - -output "_module_providers" { - description = "The providers used in this module." - value = local._module_providers -} diff --git a/version.tf b/version.tf index 9f8a44a..5970ee3 100644 --- a/version.tf +++ b/version.tf @@ -1,5 +1,4 @@ locals { _module_name = "tfmod-karpenter" - _module_version = "0.0.1" - _module_providers = ["helm", "kubernetes"] + _module_version = "0.0.2" }