Skip to content

Commit b3016bf

Browse files
author
Max Glotov
committed
fix: update karpenter module with the right config
1 parent 8ace456 commit b3016bf

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

terraform/modules/k8s-karpenter/main.tf

+18-9
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ locals {
33
karpenter = {
44
name = try(var.helm.release_name, "karpenter")
55
enabled = true
6-
chart = try(var.helm.chart_name, "oci://public.ecr.aws/karpenter/karpenter")
7-
repository = try(var.helm.repository, "")
8-
chart_version = try(var.helm.chart_version, "1.0.3")
6+
chart = try(var.helm.chart_name, "karpenter")
7+
repository = try(var.helm.repository, "oci://public.ecr.aws/karpenter")
8+
chart_version = try(var.helm.chart_version, "1.0.6")
99
namespace = try(var.helm.namespace, "karpenter")
1010
}
1111

@@ -136,14 +136,23 @@ resource "kubectl_manifest" "nodepool" {
136136
resource "helm_release" "this" {
137137
count = local.karpenter.enabled ? 1 : 0
138138

139-
name = local.karpenter.name
140-
chart = local.karpenter.chart
141-
repository = local.karpenter.repository
142-
version = local.karpenter.chart_version
143-
namespace = module.namespace[count.index].name
144-
max_history = 3
139+
name = local.karpenter.name
140+
chart = local.karpenter.chart
141+
repository = local.karpenter.repository
142+
version = local.karpenter.chart_version
143+
namespace = module.namespace[count.index].name
144+
max_history = 3
145+
146+
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
147+
repository_password = data.aws_ecrpublic_authorization_token.token.password
145148

146149
values = [
147150
local.karpenter_values
148151
]
152+
153+
lifecycle {
154+
ignore_changes = [
155+
repository_password
156+
]
157+
}
149158
}

terraform/modules/k8s-karpenter/providers.tf

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
provider "aws" {
2+
alias = "ecr"
3+
region = "us-east-1"
4+
}
5+
16
provider "kubernetes" {
27
host = data.aws_eks_cluster.main.endpoint
38
cluster_ca_certificate = base64decode(data.aws_eks_cluster.main.certificate_authority.0.data)
@@ -31,3 +36,7 @@ data "aws_eks_cluster_auth" "main" {
3136
}
3237

3338
data "aws_caller_identity" "current" {}
39+
40+
data "aws_ecrpublic_authorization_token" "token" {
41+
provider = aws.ecr
42+
}

0 commit comments

Comments
 (0)