fix name generation

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 }}
 

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 }}