diff --git a/library/common/1.0.0/templates/lib/chart/_names.tpl b/library/common/1.0.0/templates/lib/chart/_names.tpl index bec2cc42..84881615 100644 --- a/library/common/1.0.0/templates/lib/chart/_names.tpl +++ b/library/common/1.0.0/templates/lib/chart/_names.tpl @@ -38,6 +38,25 @@ Create a default fully qualified app name. {{- trunc 63 $name | trimSuffix "-" -}} {{- end -}} +{{/* Create chart name and version as used by the chart label */}} +{{- define "ix.common.names.chart" -}} + {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create the "name" + "." + "namespace" fqdn +*/}} +{{- define "ix.common.names.fqdn" -}} + {{- printf "%s.%s" (include "tc.common.names.fullname" .) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create the "fqdn" + "." + "svc.cluster.local" +*/}} +{{- define "ix.common.names.fqdn.cluster" -}} + {{- printf "%s.%s" (include "ix.common.names.fqdn" .) ".svc.cluster.local" -}} +{{- end -}} + {{/* Return the properly cased vresion of the controller type */}} @@ -52,17 +71,3 @@ Return the properly cased vresion of the controller type {{- fail (printf "Not a valid controller.type (%s)" .Values.controller.type) -}} {{- end -}} {{- end -}} - -{{/* -Create the "name" + "." + "namespace" fqdn -*/}} -{{- define "ix.common.names.fqdn" -}} - {{- printf "%s.%s" (include "tc.common.names.fullname" .) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create the "fqdn" + "." + "svc.cluster.local" -*/}} -{{- define "ix.common.names.fqdn" -}} - {{- printf "%s.%s" (include "ix.common.names.fqdn" .) ".svc.cluster.local" -}} -{{- end -}}