fix name generation

charts/cloudflared/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 2.1.0
+version: 2.1.3
 description: Cloudflared Tunnel
 keywords:
   - cloudflare

charts/cloudflared/README.md

@@ -1,6 +1,6 @@
 # cloudflared
 
-![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-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
 

charts/cloudflared/templates/_helpers.tpl

@@ -3,9 +3,9 @@ Generate the root name
 */}}
 {{- define "cloudflared.name" -}}
   {{- if .Values.name }}
-    {{- printf "%s-%s-cloudflared" .Release.Name .Values.name -}}
+    {{- printf "%s-cloudflared" .Values.name -}}
   {{- else }}
-    {{- printf "%s-cloudflared" .Release.Name -}}
+    {{- printf "cloudflared" -}}
   {{- end }}
 {{- end }}
 
@@ -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 }}

charts/cloudflared/templates/common.yaml

@@ -1,11 +1,9 @@
 {{- include "bjw-s.common.loader.init" . }}
 
 {{- define "cloudflared.hardcodedValues" -}}
-{{ if not .Values.global.nameOverride }}
 global:
   nameOverride: {{ include "cloudflared.name" . }}
   fullNameOverride: {{ include "cloudflared.name" . }}
-{{ end }}
 controllers:
   main:
     type: deployment

charts/cloudflared/templates/external-secret.yaml

@@ -3,7 +3,7 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: {{ include "secret.name" . }}
+  name: {{ .Release.Name }}-{{ include "secret.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "secret.labels" . | nindent 4 }}