Skip to content

Commit 7dc4fcd

Browse files
committed
modules cleanup
Signed-off-by: junior <junior@users.noreply.github.com>
1 parent 6698eca commit 7dc4fcd

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

module-cluster-tools.tf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ variable "prometheus_enabled" {
110110

111111
## Grafana
112112
variable "grafana_enabled" {
113-
default = false
113+
default = true
114114
description = "Enable Grafana Dashboards. Includes example dashboards and Prometheus, OCI Logging and OCI Metrics datasources"
115115
}
116116

@@ -136,6 +136,3 @@ output "app_url" {
136136
value = (var.ingress_nginx_enabled) ? format("${local.url_protocol}://%s", local.app_domain) : null
137137
description = "Application URL"
138138
}
139-
output "ingress_hosts" {
140-
value = module.cluster-tools.ingress_hosts
141-
}

module-oke.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ module "vault" {
1414
tenancy_ocid = var.tenancy_ocid
1515

1616
# Deployment Tags + Freeform Tags + Defined Tags
17-
# freeform_deployment_tags = local.freeform_deployment_tags
1817
oci_tag_values = local.oci_tag_values
1918

2019
# Encryption (OCI Vault/Key Management/KMS)
@@ -44,7 +43,7 @@ module "oke" {
4443
compartment_ocid = local.oke_compartment_ocid
4544
region = var.region
4645

47-
# Deployment Tags + Freeform Tags
46+
# Deployment Tags + Freeform Tags + Defined Tags
4847
cluster_tags = local.oci_tag_values
4948
load_balancers_tags = local.oci_tag_values
5049
block_volumes_tags = local.oci_tag_values

modules/cluster-tools/ingress-nginx.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,6 @@ output "url_protocol" {
141141
# output "app_domain" {
142142
# value = (var.ingress_hosts != "") ? local.ingress_controller_load_balancer_hostname : (var.ingress_hosts_include_nip_io ? local.app_nip_io_domain : local.ingress_controller_load_balancer_hostname)
143143
# }
144-
output "ingress_hosts" {
145-
value = local.ingress_hosts
146-
}
144+
# output "ingress_hosts" {
145+
# value = local.ingress_hosts
146+
# }

0 commit comments

Comments
 (0)