Skip to content

Commit f650386

Browse files
mglotovmglotov
authored
refactor: use dedicated file to set some helm charts options (name, repository, version) (#156)
1 parent c2cc34d commit f650386

20 files changed

+317
-200
lines changed

‎terraform/layer2-k8s/eks-aws-node-termination-handler.tf‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
locals {
2+
aws-node-termination-handler = {
3+
chart = local.helm_charts[index(local.helm_charts.*.id, "aws-node-termination-handler")].chart
4+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "aws-node-termination-handler")], "repository", null)
5+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "aws-node-termination-handler")], "version", null)
6+
}
7+
}
8+
19
resource "helm_release" "aws_node_termination_handler" {
210
name = "aws-node-termination-handler"
3-
chart = "aws-node-termination-handler"
4-
version = var.aws_node_termination_handler_version
5-
repository = local.helm_repo_eks
11+
chart = local.aws-node-termination-handler.chart
12+
repository = local.aws-node-termination-handler.repository
13+
version = local.aws-node-termination-handler.chart_version
614
namespace = module.sys_namespace.name
715
wait = false
816
max_history = var.helm_release_history_size

‎terraform/layer2-k8s/eks-calico.tf‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1+
locals {
2+
aws-calico = {
3+
chart = local.helm_charts[index(local.helm_charts.*.id, "aws-calico")].chart
4+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "aws-calico")], "repository", null)
5+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "aws-calico")], "version", null)
6+
}
7+
}
8+
19
data "template_file" "calico_daemonset" {
210
template = file("${path.module}/templates/calico-values.yaml")
311
}
412

513
resource "helm_release" "calico_daemonset" {
614
name = "aws-calico"
7-
chart = "aws-calico"
8-
repository = local.helm_repo_eks
9-
version = var.calico_daemonset
15+
chart = local.aws-calico.chart
16+
repository = local.aws-calico.repository
17+
version = local.aws-calico.chart_version
1018
namespace = "kube-system"
1119
max_history = var.helm_release_history_size
1220
wait = false

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
locals {
2+
cert-mananger-certificate = {
3+
chart = local.helm_charts[index(local.helm_charts.*.id, "cert-mananger-certificate")].chart
4+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "cert-mananger-certificate")], "repository", null)
5+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "cert-mananger-certificate")], "version", null)
6+
}
7+
}
8+
9+
data "template_file" "certificate" {
10+
template = file("${path.module}/templates/certificate-values.yaml")
11+
12+
vars = {
13+
domain_name = "*.${local.domain_name}"
14+
common_name = local.domain_name
15+
}
16+
}
17+
18+
resource "helm_release" "certificate" {
19+
name = "certificate"
20+
chart = local.cert-mananger-certificate.chart
21+
repository = local.cert-mananger-certificate.repository
22+
version = local.cert-mananger-certificate.chart_version
23+
namespace = module.ing_namespace.name
24+
wait = false
25+
max_history = var.helm_release_history_size
26+
27+
values = [
28+
data.template_file.certificate.rendered,
29+
]
30+
31+
# This dep needs for correct apply
32+
depends_on = [helm_release.cert_manager, helm_release.cluster_issuer]
33+
}

‎terraform/layer2-k8s/eks-cert-manager-cluster-issuer.tf‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
locals {
2+
cert-manager-cluster-issuer = {
3+
chart = local.helm_charts[index(local.helm_charts.*.id, "cert-manager-cluster-issuer")].chart
4+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "cert-manager-cluster-issuer")], "repository", null)
5+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "cert-manager-cluster-issuer")], "version", null)
6+
}
7+
}
8+
9+
data "template_file" "cluster_issuer" {
10+
template = file("${path.module}/templates/cluster-issuer-values.yaml")
11+
12+
vars = {
13+
region = local.region
14+
zone = local.domain_name
15+
zone_id = local.zone_id
16+
}
17+
}
18+
19+
resource "helm_release" "cluster_issuer" {
20+
name = "cluster-issuer"
21+
chart = local.cert-manager-cluster-issuer.chart
22+
repository = local.cert-manager-cluster-issuer.repository
23+
version = local.cert-manager-cluster-issuer.chart_version
24+
namespace = module.certmanager_namespace.name
25+
wait = false
26+
max_history = var.helm_release_history_size
27+
28+
values = [
29+
data.template_file.cluster_issuer.rendered,
30+
]
31+
32+
# This dep needs for correct apply
33+
depends_on = [helm_release.cert_manager]
34+
}

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
locals {
2+
cert-manager = {
3+
chart = local.helm_charts[index(local.helm_charts.*.id, "cert-manager")].chart
4+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "cert-manager")], "repository", null)
5+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "cert-manager")], "version", null)
6+
}
7+
}
8+
19
data "template_file" "cert_manager" {
210
template = file("${path.module}/templates/cert-manager-values.yaml")
311

@@ -8,10 +16,10 @@ data "template_file" "cert_manager" {
816

917
resource "helm_release" "cert_manager" {
1018
name = "cert-manager"
11-
chart = "cert-manager"
12-
repository = local.helm_repo_certmanager
19+
chart = local.cert-manager.chart
20+
repository = local.cert-manager.repository
21+
version = local.cert-manager.chart_version
1322
namespace = module.certmanager_namespace.name
14-
version = var.cert_manager_version
1523
wait = true
1624
max_history = var.helm_release_history_size
1725

‎terraform/layer2-k8s/eks-certificate.tf‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎terraform/layer2-k8s/eks-cluster-autoscaler.tf‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
locals {
2+
cluster-autoscaler = {
3+
chart = local.helm_charts[index(local.helm_charts.*.id, "cluster-autoscaler")].chart
4+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "cluster-autoscaler")], "repository", null)
5+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "cluster-autoscaler")], "version", null)
6+
}
7+
}
8+
19
data "template_file" "cluster_autoscaler" {
210
template = file("${path.module}/templates/cluster-autoscaler-values.yaml")
311

@@ -11,9 +19,9 @@ data "template_file" "cluster_autoscaler" {
1119

1220
resource "helm_release" "cluster_autoscaler" {
1321
name = "cluster-autoscaler"
14-
chart = "cluster-autoscaler"
15-
repository = local.helm_repo_cluster_autoscaler
16-
version = var.cluster_autoscaler_chart_version
22+
chart = local.cluster-autoscaler.chart
23+
repository = local.cluster-autoscaler.repository
24+
version = local.cluster-autoscaler.chart_version
1725
namespace = module.sys_namespace.name
1826
max_history = var.helm_release_history_size
1927

‎terraform/layer2-k8s/eks-cluster-issuer.tf‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎terraform/layer2-k8s/eks-external-dns.tf‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
locals {
2+
external-dns = {
3+
chart = local.helm_charts[index(local.helm_charts.*.id, "external-dns")].chart
4+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "external-dns")], "repository", null)
5+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "external-dns")], "version", null)
6+
}
7+
}
8+
19
data "template_file" "external_dns" {
210
template = file("${path.module}/templates/external-dns.yaml")
311

@@ -11,9 +19,9 @@ data "template_file" "external_dns" {
1119

1220
resource "helm_release" "external_dns" {
1321
name = "external-dns"
14-
chart = "external-dns"
15-
repository = local.helm_repo_bitnami
16-
version = var.external_dns_version
22+
chart = local.external-dns.chart
23+
repository = local.external-dns.repository
24+
version = local.external-dns.chart_version
1725
namespace = module.dns_namespace.name
1826
max_history = var.helm_release_history_size
1927

‎terraform/layer2-k8s/eks-external-secrets.tf‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
locals {
2+
external-secrets = {
3+
chart = local.helm_charts[index(local.helm_charts.*.id, "external-secrets")].chart
4+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "external-secrets")], "repository", null)
5+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "external-secrets")], "version", null)
6+
}
7+
reloader = {
8+
chart = local.helm_charts[index(local.helm_charts.*.id, "reloader")].chart
9+
repository = lookup(local.helm_charts[index(local.helm_charts.*.id, "reloader")], "repository", null)
10+
chart_version = lookup(local.helm_charts[index(local.helm_charts.*.id, "reloader")], "version", null)
11+
}
12+
}
13+
114
data "template_file" "external_secrets" {
215
template = file("${path.module}/templates/external-secrets-values.yaml")
316

@@ -9,9 +22,9 @@ data "template_file" "external_secrets" {
922

1023
resource "helm_release" "external_secrets" {
1124
name = "external-secrets"
12-
chart = "kubernetes-external-secrets"
13-
repository = local.helm_repo_external_secrets
14-
version = var.external_secrets_version
25+
chart = local.external-secrets.chart
26+
repository = local.external-secrets.repository
27+
version = local.external-secrets.chart_version
1528
namespace = module.sys_namespace.name
1629
max_history = var.helm_release_history_size
1730

@@ -22,9 +35,9 @@ resource "helm_release" "external_secrets" {
2235

2336
resource "helm_release" "reloader" {
2437
name = "reloader"
25-
chart = "reloader"
26-
repository = local.helm_repo_stakater
27-
version = var.reloader_version
38+
chart = local.reloader.chart
39+
repository = local.reloader.repository
40+
version = local.reloader.chart_version
2841
namespace = module.sys_namespace.name
2942
wait = false
3043
max_history = var.helm_release_history_size

0 commit comments

Comments
 (0)