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 ...