fix: update readme and default helm config for filebeat

clouddrove · Oct 6, 2023 · b4662a4 · b4662a4
1 parent 6617a65
commit b4662a4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/_examples/complete/variables.tf b/_examples/complete/variables.tf
@@ -145,13 +145,11 @@ variable "istio_manifests_internal" {
 variable "istio_ingress_extra_configs_internal" {
   type = any
   default = {
-    name                   = "istio-ingress-internal"
-    namespace              = "istio-system"
-    istiobase_release_name = "base-internal"
-    istiod_release_name    = "istiod-internal"
-    create_namespace       = true
-    install_istiobase      = false
-    install_istiod         = false
+    name              = "istio-ingress-internal"
+    namespace         = "istio-system"
+    create_namespace  = false
+    install_istiobase = false
+    install_istiod    = false
   }
 }
 

diff --git a/addons/filebeat/README.md b/addons/filebeat/README.md
@@ -7,9 +7,9 @@ Below terraform script shows how to use Filebeat Terraform Addon, A complete exa
 ```hcl
 module "addons" {
   source  = "clouddrove/eks-addons/aws"
-  version = "0.0.4"
+  version = "0.1.0"
   
-  depends_on       = [module.eks.cluster_id]
+  depends_on       = [module.eks]
   eks_cluster_name = module.eks.cluster_name
 
   filebeat               = true

diff --git a/addons/filebeat/locals.tf b/addons/filebeat/locals.tf
@@ -13,7 +13,7 @@ locals {
     lint                       = try(var.filebeat_extra_configs.lint, "false")
     repository_key_file        = try(var.filebeat_extra_configs.repository_key_file, "")
     repository_cert_file       = try(var.filebeat_extra_configs.repository_cert_file, "")
-    repository_username        = try(var.filebeat_extra_configs.repository_password, "")
+    repository_username        = try(var.filebeat_extra_configs.repository_username, "")
     repository_password        = try(var.filebeat_extra_configs.repository_password, "")
     verify                     = try(var.filebeat_extra_configs.verify, "false")
     keyring                    = try(var.filebeat_extra_configs.keyring, "")
@@ -34,11 +34,8 @@ locals {
     replace                    = try(var.filebeat_extra_configs.replace, "false")
   }
 
-  filebeat_extra_configs = var.filebeat_extra_configs
-
   helm_config = merge(
     local.default_helm_config,
-    var.helm_config,
-    local.filebeat_extra_configs
+    var.helm_config
   )
 }