openstack/openstack-helm-infra
Code Issues Proposed changes

HTK: support a map for hostname lookups

Browse Source 
This PS adds support for maps containing `host` for use within
the hostname lookup functions as well as a simple string.

Change-Id: I6fc5ebfb349c6581d40fe2d8723771d16ba1f9ec
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2019-01-28 10:13:59 -06:00
parent f0f1b57b3c
commit bf3871b739
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
helm-toolkit/templates/endpoints/_hostname_short_endpoint_lookup.tpl
View File

@ -17,17 +17,30 @@ limitations under the License.
{{/*
abstract: |
Resolves the short hostname for an endpoint
values: |
endpoints:
oslo_db:
hosts:
default: mariadb
host_fqdn_override:
default: null
usage: |
{{ tuple "oslo_db" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
return: |
mariadb
examples:
- values: |
endpoints:
oslo_db:
hosts:
default: mariadb
host_fqdn_override:
default: null
usage: |
{{ tuple "oslo_db" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
return: |
mariadb
- values: |
endpoints:
oslo_db:
hosts:
default:
host: mariadb
host_fqdn_override:
default: null
usage: |
{{ tuple "oslo_db" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
return: |
mariadb
*/}}
{{- define "helm-toolkit.endpoints.hostname_short_endpoint_lookup" -}}
@ -36,7 +49,11 @@ return: |
{{- $context := index . 2 -}}
{{- $endpointMap := index $context.Values.endpoints ( $type | replace "-" "_" ) }}
{{- $endpointScheme := $endpointMap.scheme }}
{{- $endpointHost := index $endpointMap.hosts $endpoint | default $endpointMap.hosts.default }}
{{- $_ := set $context.Values "__endpointHost" ( index $endpointMap.hosts $endpoint | default $endpointMap.hosts.default ) }}
{{- if kindIs "map" $context.Values.__endpointHost }}
{{- $_ := set $context.Values "__endpointHost" ( index $context.Values.__endpointHost "host" ) }}
{{- end }}
{{- $endpointHost := $context.Values.__endpointHost }}
{{- if regexMatch "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+" $endpointHost }}
{{- printf "%s" $type -}}
{{- else }}