Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
morga471 committed Jul 30, 2024
1 parent 63c247f commit 556e9ee
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 22 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -71,4 +72,4 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the
## Outputs

No outputs.
<!-- END_TF_DOCS -->
<!-- END_TF_DOCS -->
24 changes: 11 additions & 13 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -166,6 +165,5 @@ resource "kubectl_manifest" "karpenter_NodePool" {
depends_on = [
kubectl_manifest.karpenter_EC2NodeClass,
]

yaml_body = templatefile("${path.module}/EC2NodePool.yaml.tpl", {})
}
5 changes: 0 additions & 5 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
3 changes: 1 addition & 2 deletions version.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
locals {
_module_name = "tfmod-karpenter"
_module_version = "0.0.1"
_module_providers = ["helm", "kubernetes"]
_module_version = "0.0.2"
}

0 comments on commit 556e9ee

Please sign in to comment.