Reuse nexus.fullname template in nexus.proxy-ks.name (#11083)

Get rid of double dash and use a shorter name when
the release name contains chart name

Signed-off-by: Sergei Ivanov <sergei_ivanov@mail.ru>
This commit is contained in:
Sergei Ivanov
2019-02-18 11:57:06 -08:00
committed by Kubernetes Prow Robot
parent 6b08a1052b
commit 2825962427
2 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: sonatype-nexus
version: 1.16.0
version: 1.16.1
appVersion: 3.15.2-01
description: Sonatype Nexus is an open source repository manager
keywords:
+1 -2
View File
@@ -36,8 +36,7 @@ Create a default fully qualified name for proxy keystore secret.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "nexus.proxy-ks.name" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s-%s" $name .Release.Name "-proxy-ks" | trunc 63 | trimSuffix "-" -}}
{{- printf "%s-%s" (include "nexus.fullname" .) "proxy-ks" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/* Manage the labels for each entity */}}