From a10c1b0c6cd527f45704920145939aa31e8eaaed Mon Sep 17 00:00:00 2001
From: "Terekhin, Alexey (at4945)" <at4945@att.com>
Date: Mon, 15 Aug 2022 11:57:19 -0700
Subject: [PATCH] Fix for getting kibana ingress parameters.

This change fixed getting network kibana ingress parameters
from override value files.

Change-Id: If9931267edad2c1196e395168c562ef0d0d380d6
---
 helm-toolkit/Chart.yaml                       | 2 +-
 helm-toolkit/templates/manifests/_ingress.tpl | 2 +-
 releasenotes/notes/helm-toolkit.yaml          | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index 2ccfb496a..17c1df574 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
-version: 0.2.45
+version: 0.2.46
 home: https://docs.openstack.org/openstack-helm
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
 sources:
diff --git a/helm-toolkit/templates/manifests/_ingress.tpl b/helm-toolkit/templates/manifests/_ingress.tpl
index f05f7b793..70e64cce8 100644
--- a/helm-toolkit/templates/manifests/_ingress.tpl
+++ b/helm-toolkit/templates/manifests/_ingress.tpl
@@ -685,7 +685,7 @@ spec:
 {{ $hostRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4 }}
 {{- end }}
 {{- if not ( hasSuffix ( printf ".%s.svc.%s" $envAll.Release.Namespace $envAll.Values.endpoints.cluster_domain_suffix) $hostNameFull) }}
-{{- $ingressConf := $envAll.Values.network -}}
+{{- $ingressConf := $envAll.Values.network.kibana.ingress -}}
 {{- $ingressClasses := ternary (tuple "namespace") (tuple "namespace" "cluster") (and (hasKey $ingressConf "use_external_ingress_controller") $ingressConf.use_external_ingress_controller) }}
 {{- range $key2, $ingressController := $ingressClasses }}
 {{- $vHosts := list $hostNameFull }}
diff --git a/releasenotes/notes/helm-toolkit.yaml b/releasenotes/notes/helm-toolkit.yaml
index f79ad9c1f..6a5a6bc6c 100644
--- a/releasenotes/notes/helm-toolkit.yaml
+++ b/releasenotes/notes/helm-toolkit.yaml
@@ -52,4 +52,5 @@ helm-toolkit:
   - 0.2.43 Support having a single external ingress controller
   - 0.2.44 Added OCI registry authentication
   - 0.2.45 Modify use_external_ingress_controller place in openstack-helm values.yaml
+  - 0.2.46 Fixed for getting kibana ingress value parameters
 ...