From aacb627f129534fe89b602d5f1d8b233629a2396 Mon Sep 17 00:00:00 2001 From: vesko-tyk Date: Thu, 8 Jul 2021 15:48:46 +0100 Subject: [PATCH] Fix adding unnecessary new line to the end of entries --- tyk-headless/templates/_helpers.tpl | 14 +++++++------- tyk-hybrid/templates/_helpers.tpl | 12 ++++++------ tyk-pro/templates/_helpers.tpl | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tyk-headless/templates/_helpers.tpl b/tyk-headless/templates/_helpers.tpl index 4aec92ae..66c7e525 100644 --- a/tyk-headless/templates/_helpers.tpl +++ b/tyk-headless/templates/_helpers.tpl @@ -1,12 +1,12 @@ -{{/* vim: set filetype=mustache: */}} -{{/* +{{- /* vim: set filetype=mustache: */}} +{{- /* Expand the name of the chart. */}} {{- define "tyk-headless.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* +{{- /* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. @@ -24,14 +24,14 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{- end -}} -{{/* +{{- /* Create chart name and version as used by the chart label. */}} {{- define "tyk-headless.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* Create Sematic Version of gateway without prefix v */}} +{{- /* Create Sematic Version of gateway without prefix v */}} {{- define "tyk-headless.gateway-version" -}} {{- printf "%s" .Values.gateway.image.tag | replace "v" "" -}} {{- end -}} @@ -39,7 +39,7 @@ Create chart name and version as used by the chart label. {{- define "tyk-headless.redis_url" -}} {{- if .Values.redis.addrs -}} {{ join "," .Values.redis.addrs }} -{{/* Adds support for older charts with the host and port options */}} +{{- /* Adds support for older charts with the host and port options */}} {{- else if and .Values.redis.host .Values.redis.port -}} {{ .Values.redis.host }}:{{ .Values.redis.port }} {{- else -}} @@ -50,7 +50,7 @@ redis.{{ .Release.Namespace }}.svc.cluster.local:6379 {{- define "tyk-headless.mongo_url" -}} {{- if .Values.mongo.mongoURL -}} {{ .Values.mongo.mongoURL }} -{{/* Adds support for older charts with the host and port options */}} +{{- /* Adds support for older charts with the host and port options */}} {{- else if and .Values.mongo.host .Values.mongo.port -}} mongodb://{{ .Values.mongo.host }}:{{ .Values.mongo.port }}/tyk_analytics {{- else -}} diff --git a/tyk-hybrid/templates/_helpers.tpl b/tyk-hybrid/templates/_helpers.tpl index 69f9814c..a5e4a526 100644 --- a/tyk-hybrid/templates/_helpers.tpl +++ b/tyk-hybrid/templates/_helpers.tpl @@ -1,12 +1,12 @@ -{{/* vim: set filetype=mustache: */}} -{{/* +{{- /* vim: set filetype=mustache: */}} +{{- /* Expand the name of the chart. */}} {{- define "tyk-hybrid.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* +{{- /* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. @@ -24,7 +24,7 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{- end -}} -{{/* +{{- /* Create chart name and version as used by the chart label. */}} {{- define "tyk-hybrid.chart" -}} @@ -42,10 +42,10 @@ http {{- define "tyk-hybrid.redis_url" -}} {{- if .Values.redis.addrs -}} {{ join "," .Values.redis.addrs }} -{{/* Adds support for older charts with the host and port options */}} +{{- /* Adds support for older charts with the host and port options */}} {{- else if and .Values.redis.host .Values.redis.port -}} {{ .Values.redis.host }}:{{ .Values.redis.port }} {{- else -}} redis.{{ .Release.Namespace }}.svc.cluster.local:6379 {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/tyk-pro/templates/_helpers.tpl b/tyk-pro/templates/_helpers.tpl index b361addc..9d26e98f 100644 --- a/tyk-pro/templates/_helpers.tpl +++ b/tyk-pro/templates/_helpers.tpl @@ -1,12 +1,12 @@ -{{/* vim: set filetype=mustache: */}} -{{/* +{{- /* vim: set filetype=mustache: */}} +{{- /* Expand the name of the chart. */}} {{- define "tyk-pro.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* +{{- /* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. @@ -24,7 +24,7 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{- end -}} -{{/* +{{- /* Create chart name and version as used by the chart label. */}} {{- define "tyk-pro.chart" -}} @@ -58,7 +58,7 @@ http {{- define "tyk-pro.redis_url" -}} {{- if .Values.redis.addrs -}} {{ join "," .Values.redis.addrs }} -{{/* Adds support for older charts with the host and port options */}} +{{- /* Adds support for older charts with the host and port options */}} {{- else if and .Values.redis.host .Values.redis.port -}} {{ .Values.redis.host }}:{{ .Values.redis.port }} {{- else -}} @@ -69,7 +69,7 @@ redis.{{ .Release.Namespace }}.svc.cluster.local:6379 {{- define "tyk-pro.mongo_url" -}} {{- if .Values.mongo.mongoURL -}} {{ .Values.mongo.mongoURL }} -{{/* Adds support for older charts with the host and port options */}} +{{- /* Adds support for older charts with the host and port options */}} {{- else if and .Values.mongo.host .Values.mongo.port -}} mongodb://{{ .Values.mongo.host }}:{{ .Values.mongo.port }}/tyk_analytics {{- else -}} @@ -77,7 +77,7 @@ mongodb://mongo.{{ .Release.Namespace }}.svc.cluster.local:27017/tyk_analytics {{- end -}} {{- end -}} -{{/* Create Sematic Version of gateway without prefix v */}} +{{- /* Create Sematic Version of gateway without prefix v */}} {{- define "tyk-pro.gateway-version" -}} {{- printf "%s" .Values.gateway.image.tag | replace "v" "" -}} {{- end -}}