Skip to content

Commit 1260aff

Browse files
vitaliimdp1gmale0n
authored andcommitted
fix: Bug/terragrunt deploy cluster issuer (#332)
* change paht helm chart * update terraform docs
1 parent 517662a commit 1260aff

File tree

6 files changed

+15
-159
lines changed

6 files changed

+15
-159
lines changed

terraform/layer2-k8s/README.md

Lines changed: 1 addition & 153 deletions
Large diffs are not rendered by default.

terraform/layer2-k8s/eks-cert-manager.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ resource "helm_release" "cluster_issuer" {
191191
count = local.cert_manager_cluster_issuer.enabled ? 1 : 0
192192

193193
name = local.cert_manager_cluster_issuer.name
194-
chart = local.cert_manager_cluster_issuer.chart
194+
chart = "${var.helm_charts_path}/${local.cert_manager_cluster_issuer.chart}"
195195
repository = local.cert_manager_cluster_issuer.repository
196196
version = local.cert_manager_cluster_issuer.chart_version
197197
namespace = local.cert_manager_cluster_issuer.namespace
@@ -209,7 +209,7 @@ resource "helm_release" "certificate" {
209209
count = local.cert_mananger_certificate.enabled ? 1 : 0
210210

211211
name = local.cert_mananger_certificate.name
212-
chart = local.cert_mananger_certificate.chart
212+
chart = "${var.helm_charts_path}/${local.cert_mananger_certificate.chart}"
213213
repository = local.cert_mananger_certificate.repository
214214
version = local.cert_mananger_certificate.chart_version
215215
namespace = local.cert_mananger_certificate.namespace

terraform/layer2-k8s/eks-elk.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ resource "helm_release" "elk" {
842842
count = local.elk.enabled ? 1 : 0
843843

844844
name = local.elk.name
845-
chart = local.elk.chart
845+
chart = "${var.helm_charts_path}/${local.elk.chart}"
846846
repository = local.elk.repository
847847
version = local.elk.chart_version
848848
namespace = module.elk_namespace[count.index].name

terraform/layer2-k8s/helm-releases.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ releases:
1919
namespace: certmanager
2020
- id: cert-mananger-certificate
2121
enabled: false
22-
chart: ../../helm-charts/certificate
22+
chart: certificate
2323
repository:
2424
chart_version:
2525
namespace: ingress-nginx
2626
- id: cert-manager-cluster-issuer
2727
enabled: false
28-
chart: ../../helm-charts/cluster-issuer
28+
chart: cluster-issuer
2929
repository:
3030
chart_version:
3131
namespace: certmanager
@@ -37,7 +37,7 @@ releases:
3737
namespace: cluster-autoscaler
3838
- id: elk
3939
enabled: false
40-
chart: ../../helm-charts/elk
40+
chart: elk
4141
repository:
4242
chart_version:
4343
namespace: elk

terraform/layer2-k8s/variables.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,10 @@ variable "cluster_autoscaler_version" {
105105
description = "Version of cluster autoscaler"
106106
default = "v1.25.0"
107107
}
108+
109+
110+
variable "helm_charts_path" {
111+
type = string
112+
description = "where to find the helm charts"
113+
default = "../../helm-charts/"
114+
}

terragrunt/demo/us-east-1/k8s-addons/terragrunt.hcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ inputs = {
4040
eks_cluster_id = dependency.aws-base.outputs.eks_cluster_id
4141
eks_oidc_provider_arn = dependency.aws-base.outputs.eks_oidc_provider_arn
4242
ssl_certificate_arn = dependency.aws-base.outputs.ssl_certificate_arn
43+
helm_charts_path = "${get_terragrunt_dir()}/../../../../helm-charts"
4344
}

0 commit comments

Comments
 (0)