From 69b32b7563fd4f1078d01e42135c6e5548e19ee3 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Wed, 17 Dec 2025 18:12:07 -0600
Subject: [PATCH] fix name generation

---
 charts/cloudflared/Chart.yaml             | 2 +-
 charts/cloudflared/README.md              | 2 +-
 charts/cloudflared/templates/_helpers.tpl | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/charts/cloudflared/Chart.yaml b/charts/cloudflared/Chart.yaml
index 22daa9b..87d26c4 100644
--- a/charts/cloudflared/Chart.yaml
+++ b/charts/cloudflared/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 2.1.2
+version: 2.1.3
 description: Cloudflared Tunnel
 keywords:
   - cloudflare
diff --git a/charts/cloudflared/README.md b/charts/cloudflared/README.md
index 6610650..d96dae5 100644
--- a/charts/cloudflared/README.md
+++ b/charts/cloudflared/README.md
@@ -1,6 +1,6 @@
 # cloudflared
 
-![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![AppVersion: 2025.11.1](https://img.shields.io/badge/AppVersion-2025.11.1-informational?style=flat-square)
+![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![AppVersion: 2025.11.1](https://img.shields.io/badge/AppVersion-2025.11.1-informational?style=flat-square)
 
 Cloudflared Tunnel
 
diff --git a/charts/cloudflared/templates/_helpers.tpl b/charts/cloudflared/templates/_helpers.tpl
index 5074a87..6b363a5 100644
--- a/charts/cloudflared/templates/_helpers.tpl
+++ b/charts/cloudflared/templates/_helpers.tpl
@@ -17,7 +17,7 @@ Generate the secret name
     {{- if .Values.secret.externalSecret.nameOverride }}
       {{- .Values.secret.externalSecret.nameOverride | trunc 63 | trimSuffix "-" }}
     {{- else }}
-      {{- printf "%s-secret" (include "cloudflared.name" .) -}}
+      {{- printf "%s-%s-secret" .Release.Name (include "cloudflared.name" .) -}}
     {{- end }}
   {{- else if .Values.secret.existingSecret.name }}
     {{- printf "%s" .Values.secret.existingSecret.name -}}
@@ -44,7 +44,11 @@ Generate path in the secret store
 */}}
 {{- define "secret.path" -}}
   {{- if and (.Values.secret.externalSecret.enabled) (.Values.secret.externalSecret.store.path) }}
-    {{- printf "%s/%s" .Values.secret.externalSecret.store.path .Release.Name -}}
+    {{- if .Values.name }}
+      {{- printf "%s/%s-%s" .Values.secret.externalSecret.store.path .Release.Name .Values.name -}}
+    {{- else }}
+      {{- printf "%s/%s" .Values.secret.externalSecret.store.path .Release.Name -}}
+    {{- end }}
   {{- else }}
     {{ fail "No Secret Store Path Found!" }}
   {{- end }}