From a4a2b5803b4db8b99905e573353c735f55e69564 Mon Sep 17 00:00:00 2001
From: Yanos Angelopoulos <yanos@admin.grnet.gr>
Date: Wed, 13 Jul 2022 13:23:27 +0300
Subject: [PATCH] Modify use_external_ingress_controller place in
 openstack-helm

Having the "use_external_ingress_controller" field in
"network.server.ingress" yaml path is not a good choice as there are
services such neutron that use this path to define backend service,
named "server", options. We propose moving it to the root of the
path "network".

Change-Id: If98d6555a9c012872d3fb1a38b370a3195ea49ab
---
 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 17df30831..2ccfb496a 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.44
+version: 0.2.45
 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 7846895fc..f05f7b793 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.server.ingress -}}
+{{- $ingressConf := $envAll.Values.network -}}
 {{- $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 b0b828442..f79ad9c1f 100644
--- a/releasenotes/notes/helm-toolkit.yaml
+++ b/releasenotes/notes/helm-toolkit.yaml
@@ -51,4 +51,5 @@ helm-toolkit:
   - 0.2.42 Database B/R - fix to make script compliant with a retention policy
   - 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
 ...