Skip to content

Commit fb104ed

Browse files
committed
ingress tls updates
Signed-off-by: junior <junior@users.noreply.github.com>
1 parent e768a63 commit fb104ed

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

modules/cluster-tools/grafana.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ resource "kubernetes_ingress_v1" "grafana" {
196196
}
197197
}
198198
}
199+
200+
tls {
201+
secret_name = "grafana-${var.ingress_cluster_issuer}-tls"
202+
hosts = local.ingress_hosts
203+
}
199204
}
200205
depends_on = [helm_release.ingress_nginx, helm_release.grafana]
201206

modules/cluster-tools/ingress-nginx.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ locals {
102102
# ingress_controller_load_balancer_hostname = var.ingress_nginx_enabled ? (data.kubernetes_service.ingress.0.status.0.load_balancer.0.ingress.0.hostname == "" ?
103103
# (var.ingress_hosts_include_nip_io ? local.app_nip_io_domain : local.ingress_controller_load_balancer_ip) : data.kubernetes_service.ingress.0.status.0.load_balancer.0.ingress.0.hostname) : "#Ingress_Controller_Not_Deployed"
104104
ingress_controller_load_balancer_hostname = var.ingress_nginx_enabled ? (
105-
var.ingress_hosts != "" ? local.ingress_hosts[0] : (var.ingress_hosts_include_nip_io ? local.app_nip_io_domain : local.ingress_controller_load_balancer_ip)) : "#Ingress_Controller_Not_Deployed"
105+
var.ingress_hosts != "" ? local.ingress_hosts[0] : (var.ingress_hosts_include_nip_io ? local.app_nip_io_domain : local.ingress_controller_load_balancer_ip)) : "#Ingress_Controller_Not_Deployed"
106106

107107
ingress_nginx_annotations_basic = {
108108
"nginx.ingress.kubernetes.io/rewrite-target" = "/$2"

modules/cluster-tools/providers.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
terraform {
66
required_version = ">= 1.1"
77
required_providers {
8-
oci = {
9-
source = "oracle/oci"
10-
version = "~> 4"
11-
# https://registry.terraform.io/providers/oracle/oci/
12-
}
138
kubernetes = {
149
source = "hashicorp/kubernetes"
1510
version = "~> 2"

0 commit comments

Comments
 (0)