rewrite name generation

charts/cloudflared/templates/_helpers.tpl

@@ -1,3 +1,14 @@
+{{/*
+Generate the root name
+*/}}
+{{- define "cloudflared.name" -}}
+  {{- if .Values.name }}
+    {{- printf "%s-%s-cloudflared" .Release.Name .Values.name -}}
+  {{- else }}
+    {{- printf "%s-cloudflared" .Release.Name -}}
+  {{- end }}
+{{- end }}
+
 {{/*
 Generate the secret name
 */}}
@@ -6,7 +17,7 @@ Generate the secret name
     {{- if .Values.secret.externalSecret.nameOverride }}
       {{- .Values.secret.externalSecret.nameOverride | trunc 63 | trimSuffix "-" }}
     {{- else }}
-      {{- printf "%s-cloudflared-secret" .Release.Name -}}
+      {{- printf "%s-secret" (include "cloudflared.name" .) -}}
     {{- end }}
   {{- else if .Values.secret.existingSecret.name }}
     {{- printf "%s" .Values.secret.existingSecret.name -}}

charts/cloudflared/templates/common.yaml

@@ -3,7 +3,8 @@
 {{- define "cloudflared.hardcodedValues" -}}
 {{ if not .Values.global.nameOverride }}
 global:
-  nameOverride: {{ .Values.name }}
+  nameOverride: {{ include "cloudflared.name" . }}
+  fullNameOverride: {{ include "cloudflared.name" . }}
 {{ end }}
 controllers:
   main: