openstack/openstack-helm-infra
Code Issues Proposed changes

Support having a single external ingress controller

Browse Source 
This change allows creating a single ingress resource using the
public fqdn of the service, instead of two (cluster and namespace)
that is currently the case. Every openstack-helm chart can have a
network.server.ingress.use_external_ingress_controller boolean
field to choose the creation of a single ingress resource
(ingressName-namespace-fqdn).

Signed-off-by: Yanos Angelopoulos <yanos@admin.grnet.gr>
Change-Id: I46da850fccc3fee76595a2e6c49d51197a282c3e
This commit is contained in:
Yanos Angelopoulos 2022-06-09 13:43:20 +03:00 committed by Karl Kloppenborg
parent e511ba8517
commit 772198f15d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helm-toolkit/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Helm-Toolkit description: OpenStack-Helm Helm-Toolkit
name: helm-toolkit name: helm-toolkit
version: 0.2.42 version: 0.2.43
home: https://docs.openstack.org/openstack-helm home: https://docs.openstack.org/openstack-helm
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
sources: sources:

4
helm-toolkit/templates/manifests/_ingress.tpl
View File

@ -685,7 +685,9 @@ spec:
{{ $hostRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4 }} {{ $hostRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4 }}
{{- end }} {{- end }}
{{- if not ( hasSuffix ( printf ".%s.svc.%s" $envAll.Release.Namespace $envAll.Values.endpoints.cluster_domain_suffix) $hostNameFull) }} {{- if not ( hasSuffix ( printf ".%s.svc.%s" $envAll.Release.Namespace $envAll.Values.endpoints.cluster_domain_suffix) $hostNameFull) }}
{{- range $key2, $ingressController := tuple "namespace" "cluster" }} {{- $ingressConf := $envAll.Values.network.server.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 }} {{- $vHosts := list $hostNameFull }}
--- ---
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1

1
releasenotes/notes/helm-toolkit.yaml
View File

@ -49,4 +49,5 @@ helm-toolkit:
- 0.2.40 Revert chart naming for subchart compatibility - 0.2.40 Revert chart naming for subchart compatibility
- 0.2.41 Database B/R - archive name parser added - 0.2.41 Database B/R - archive name parser added
- 0.2.42 Database B/R - fix to make script compliant with a retention policy - 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
... ...