Skip to content

Commit a25086e

Browse files
committed
optional cluster-tools namespace
Signed-off-by: junior <junior@users.noreply.github.com>
1 parent 92ee15f commit a25086e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

modules/cluster-tools/cert-manager.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module "cert-manager" {
1212
source = "./modules/cert-manager"
1313

1414
# Helm Release variables
15-
chart_namespace = kubernetes_namespace.cluster_tools.id
15+
chart_namespace = kubernetes_namespace.cluster_tools.0.id
1616
chart_repository = local.helm_repository.jetstack
1717
chart_version = local.helm_repository.jetstack_version
1818
ingress_email_issuer = var.ingress_email_issuer

modules/cluster-tools/grafana.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resource "helm_release" "grafana" {
1616
repository = local.helm_repository.grafana
1717
chart = "grafana"
1818
version = local.helm_repository.grafana_version
19-
namespace = kubernetes_namespace.cluster_tools.id
19+
namespace = kubernetes_namespace.cluster_tools.0.id
2020
wait = false
2121

2222
set {
@@ -120,7 +120,7 @@ datasources:
120120
datasources:
121121
- name: Prometheus
122122
type: prometheus
123-
url: http://prometheus-server.${kubernetes_namespace.cluster_tools.id}.svc.cluster.local
123+
url: http://prometheus-server.${kubernetes_namespace.cluster_tools.0.id}.svc.cluster.local
124124
access: proxy
125125
isDefault: true
126126
disableDeletion: true
@@ -154,7 +154,7 @@ resource "kubernetes_ingress_v1" "grafana" {
154154
wait_for_load_balancer = true
155155
metadata {
156156
name = "grafana"
157-
namespace = kubernetes_namespace.cluster_tools.id
157+
namespace = kubernetes_namespace.cluster_tools.0.id
158158
annotations = local.ingress_nginx_annotations
159159
}
160160
spec {
@@ -210,7 +210,7 @@ resource "kubernetes_ingress_v1" "grafana" {
210210
data "kubernetes_secret" "grafana" {
211211
metadata {
212212
name = "grafana"
213-
namespace = kubernetes_namespace.cluster_tools.id
213+
namespace = kubernetes_namespace.cluster_tools.0.id
214214
}
215215
depends_on = [helm_release.grafana]
216216

modules/cluster-tools/ingress-nginx.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ resource "helm_release" "ingress_nginx" {
5959
repository = local.helm_repository.ingress_nginx
6060
chart = "ingress-nginx"
6161
version = local.helm_repository.ingress_nginx_version
62-
namespace = kubernetes_namespace.cluster_tools.id
62+
namespace = kubernetes_namespace.cluster_tools.0.id
6363
wait = true
6464

6565
set {
@@ -89,7 +89,7 @@ resource "helm_release" "ingress_nginx" {
8989
data "kubernetes_service" "ingress" {
9090
metadata {
9191
name = "ingress-nginx-controller"
92-
namespace = kubernetes_namespace.cluster_tools.id
92+
namespace = kubernetes_namespace.cluster_tools.0.id
9393
}
9494
depends_on = [helm_release.ingress_nginx]
9595

modules/cluster-tools/prometheus.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resource "helm_release" "prometheus" {
1616
repository = local.helm_repository.prometheus
1717
chart = "prometheus"
1818
version = local.helm_repository.prometheus_version
19-
namespace = kubernetes_namespace.cluster_tools.id
19+
namespace = kubernetes_namespace.cluster_tools.0.id
2020
wait = false
2121

2222

0 commit comments

Comments
 (0)