File tree Expand file tree Collapse file tree 3 files changed +5
-9
lines changed Expand file tree Collapse file tree 3 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ variable "prometheus_enabled" {
110
110
111
111
# # Grafana
112
112
variable "grafana_enabled" {
113
- default = false
113
+ default = true
114
114
description = " Enable Grafana Dashboards. Includes example dashboards and Prometheus, OCI Logging and OCI Metrics datasources"
115
115
}
116
116
@@ -136,6 +136,3 @@ output "app_url" {
136
136
value = (var. ingress_nginx_enabled ) ? format (" ${ local . url_protocol } ://%s" , local. app_domain ) : null
137
137
description = " Application URL"
138
138
}
139
- output "ingress_hosts" {
140
- value = module. cluster-tools . ingress_hosts
141
- }
Original file line number Diff line number Diff line change @@ -14,7 +14,6 @@ module "vault" {
14
14
tenancy_ocid = var. tenancy_ocid
15
15
16
16
# Deployment Tags + Freeform Tags + Defined Tags
17
- # freeform_deployment_tags = local.freeform_deployment_tags
18
17
oci_tag_values = local. oci_tag_values
19
18
20
19
# Encryption (OCI Vault/Key Management/KMS)
@@ -44,7 +43,7 @@ module "oke" {
44
43
compartment_ocid = local. oke_compartment_ocid
45
44
region = var. region
46
45
47
- # Deployment Tags + Freeform Tags
46
+ # Deployment Tags + Freeform Tags + Defined Tags
48
47
cluster_tags = local. oci_tag_values
49
48
load_balancers_tags = local. oci_tag_values
50
49
block_volumes_tags = local. oci_tag_values
Original file line number Diff line number Diff line change @@ -141,6 +141,6 @@ output "url_protocol" {
141
141
# output "app_domain" {
142
142
# 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)
143
143
# }
144
- output "ingress_hosts" {
145
- value = local. ingress_hosts
146
- }
144
+ # output "ingress_hosts" {
145
+ # value = local.ingress_hosts
146
+ # }
You can’t perform that action at this time.
0 commit comments