From f526decd27ab8e00769c2c48f61af6fca520dd8d Mon Sep 17 00:00:00 2001
From: Juan Ariza Toledano <juan@bitnami.com>
Date: Thu, 11 Jul 2019 15:46:56 +0200
Subject: [PATCH] [stable/nats] Standardize 'fullname' and 'name' macros
 (#15439)

Signed-off-by: juan131 <juan@bitnami.com>
---
 stable/nats/Chart.yaml             | 2 +-
 stable/nats/README.md              | 2 ++
 stable/nats/templates/_helpers.tpl | 8 ++++++++
 stable/nats/values-production.yaml | 8 ++++++++
 stable/nats/values.yaml            | 8 ++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/stable/nats/Chart.yaml b/stable/nats/Chart.yaml
index 979e918a4b..2d62158415 100644
--- a/stable/nats/Chart.yaml
+++ b/stable/nats/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nats
-version: 3.0.1
+version: 3.0.2
 appVersion: 2.0.0
 description: An open-source, cloud-native messaging system
 keywords:
diff --git a/stable/nats/README.md b/stable/nats/README.md
index e2b253f138..31d4097f95 100644
--- a/stable/nats/README.md
+++ b/stable/nats/README.md
@@ -54,6 +54,8 @@ The following table lists the configurable parameters of the NATS chart and thei
 | `image.tag`                          | NATS Image tag                                                                               | `{TAG_NAME}`                                                  |
 | `image.pullPolicy`                   | Image pull policy                                                                            | `IfNotPresent`                                                |
 | `image.pullSecrets`                  | Specify docker-registry secret names as an array                                             | `[]` (does not add image pull secrets to deployed pods)       |
+| `nameOverride`                       | String to partially override nats.fullname template with a string (will prepend the release name) | `nil`                                                    |
+| `fullnameOverride`                   | String to fully override nats.fullname template with a string                                | `nil`                                                         |
 | `auth.enabled`                       | Switch to enable/disable client authentication                                               | `true`                                                        |
 | `auth.user`                          | Client authentication user                                                                   | `nats_cluster`                                                |
 | `auth.password`                      | Client authentication password                                                               | `random alhpanumeric string (10)`                             |
diff --git a/stable/nats/templates/_helpers.tpl b/stable/nats/templates/_helpers.tpl
index 6159ca0959..b52eed8473 100644
--- a/stable/nats/templates/_helpers.tpl
+++ b/stable/nats/templates/_helpers.tpl
@@ -12,9 +12,17 @@ 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).
 */}}
 {{- define "nats.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
+{{- end -}}
 
 {{- define "nats.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
diff --git a/stable/nats/values-production.yaml b/stable/nats/values-production.yaml
index 1601d79e94..2abfeb7c73 100644
--- a/stable/nats/values-production.yaml
+++ b/stable/nats/values-production.yaml
@@ -26,6 +26,14 @@ image:
   # pullSecrets:
   #   - name: myRegistryKeySecretName
 
+## String to partially override nats.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override nats.fullname template
+##
+# fullnameOverride:
+
 ## NATS replicas
 replicaCount: 3
 
diff --git a/stable/nats/values.yaml b/stable/nats/values.yaml
index 7b2865d648..e382fb5c92 100644
--- a/stable/nats/values.yaml
+++ b/stable/nats/values.yaml
@@ -26,6 +26,14 @@ image:
   # pullSecrets:
   #   - name: myRegistryKeySecretName
 
+## String to partially override nats.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override nats.fullname template
+##
+# fullnameOverride:
+
 ## NATS replicas
 replicaCount: 1