Merge pull request #10 from gfortil/HPCC-27030

HPCC-27030 Enable elastic4hpcclogs by default and remove custom values.yaml file
hpcc-systems · Apr 26, 2022 · 8f00201 · 8f00201
2 parents 3557258 + 54e87d0
commit 8f00201
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 97 deletions.
diff --git a/examples/admin.tfvars b/examples/admin.tfvars
@@ -71,7 +71,7 @@ hpcc = {
 }
 
 elk = {
-  enable = false
+  enable = true
   name   = "myhpccelk"
   # chart  = ""
   # values = []

diff --git a/main.tf b/main.tf
@@ -178,7 +178,7 @@ resource "helm_release" "elk" {
   name                       = local.elk_name
   namespace                  = try(var.hpcc.namespace, terraform.workspace)
   chart                      = local.elk_chart
-  values                     = concat(try([for v in var.elk.values : file(v)], []), var.expose_services ? [file("${path.root}/values/elk.yaml")] : [])
+  values                     = try([for v in var.elk.values : file(v)], [])
   create_namespace           = true
   atomic                     = try(var.elk.atomic, null)
   recreate_pods              = try(var.elk.recreate_pods, null)

diff --git a/values/elk.yaml b/values/elk.yaml