fix/istio-base-override-values (#145)

Co-authored-by: CloudDrove CI <84795582+clouddrove-ci@users.noreply.github.com>

Author: Arzianghanchi

addons/istio-ingress/locals.tf

@@ -1,6 +1,6 @@
 locals {
   istio_base = {
-    helm_config = {
+    default_helm_config = {
       name             = try(var.istio_ingress_extra_configs.istiobase_release_name, "base")
       chart            = "base"
       repository       = "https://istio-release.storage.googleapis.com/charts"
@@ -63,11 +63,11 @@ locals {
 
   istiod_helm_config = merge(
     local.istiod.default_helm_config,
-    var.istio_ingress_extra_configs.istiod
+    try(var.istio_ingress_extra_configs.istiod, {})
   )
 
   istio_base_helm_config = merge(
-    local.istio_base.helm_config,
-    var.istio_ingress_extra_configs.istio_base
+    local.istio_base.default_helm_config,
+    try(var.istio_ingress_extra_configs.istio_base, {})
   )
 }

addons/istio-ingress/main.tf

@@ -3,7 +3,7 @@ module "istio_base" {
   count  = try(var.istio_ingress_extra_configs.install_istiobase, true) ? 1 : 0
 
   manage_via_gitops = var.manage_via_gitops
-  helm_config       = local.istio_base.helm_config
+  helm_config       = local.istio_base_helm_config
   addon_context     = var.addon_context
 
 }
@@ -40,4 +40,3 @@ resource "kubectl_manifest" "istio_gateway_manifest" {
   depends_on = [kubectl_manifest.istio_ingress_manifest]
   yaml_body  = file(var.istio_manifests.istio_gateway_manifest_file_path[count.index])
 }
-

addons/istio-ingress/variables.tf

@@ -37,9 +37,3 @@ variable "istio_ingress_extra_configs" {
   type        = any
   default     = {}
 }
-
-variable "istiod_helm_config" {
-  description = "Path to override-values.yaml for Istiod Helm Chart"
-  type        = any
-  default     = null
-}