move helper variables to variables sub-namespace

common/templates/_extra_ingress.tpl

-{{- define "common.extra-ingress.ingress" -}}
+{{- define "common.extra-ingress" -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -8,14 +8,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "common.variables.labels" . | nindent 4 }}
 spec:
   {{- with .Values.ingressClassName }}
   ingressClassName: {{ . | quote }}
   {{- end }}
   rules:
-    {{- (include "common.extra-ingress.rules" .) | nindent 4 }}
+    {{- (include "common.variables.extra-ingress.rules" .) | nindent 4 }}
   tls:
-    {{- (include "common.extra-ingress.tls" .) | nindent 4 }}
+    {{- (include "common.variables.extra-ingress.tls" .) | nindent 4 }}
 ---
 {{- end }}

common/templates/_helpers.tpl

 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "common.chart" -}}
+{{- define "common.variables.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "common.labels" -}}
-helm.sh/chart: {{ include "common.chart" . }}
+{{- define "common.variables.labels" -}}
+helm.sh/chart: {{ include "common.variables.chart" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -23,7 +23,7 @@ Extra Ingress
 {{/*
 Extra Ingress Rules
 */}}
-{{- define "common.extra-ingress.rules" -}}
+{{- define "common.variables.extra-ingress.rules" -}}
 {{- $rules := list -}}
 {{- range $name, $rule := .Values.rules -}}
   {{- $rules = append $rules $rule -}}
@@ -34,7 +34,7 @@ Extra Ingress Rules
 {{/*
 Extra Ingress TLS
 */}}
-{{- define "common.extra-ingress.tls" -}}
+{{- define "common.variables.extra-ingress.tls" -}}
 {{- $tlsDefinitions := list -}}
 {{- range $name, $tlsDefinition := .Values.tls -}}
   {{- $tlsDefinitions = append $tlsDefinitions $tlsDefinition -}}
@@ -49,7 +49,7 @@ Secret
 {{/*
 Secret data
 */}}
-{{- define "common.secret.data" -}}
+{{- define "common.variables.secret.data" -}}
 {{- $data := dict -}}
 {{- range $key, $value := .Values.data -}}
   {{- $data = merge $data (dict $key $value) -}}

common/templates/_persistentvolume.tpl

 # Only use for static provisioning, dynamic provisioning will provision the pv upon request
-{{- define "common.persistentvolume.persistentvolume" -}}
+{{- define "common.persistentvolume" -}}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -9,7 +9,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "common.variables.labels" . | nindent 4 }}
 spec:
   capacity:
     storage: {{ .Values.size }}

common/templates/_secret.tpl

-{{- define "common.secret.secret" -}}
+{{- define "common.secret" -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,9 +8,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "common.variables.labels" . | nindent 4 }}
 type: {{ .Values.type | default "Opaque" }}
 data:
-  {{- (include "common.secret.data" .) | nindent 2 }}
+  {{- (include "common.variables.secret.data" .) | nindent 2 }}
 ---
 {{- end }}

example/templates/extra_ingress.yaml

 {{- if .Values.extraIngress }}
-{{ include "common.extra-ingress.ingress" (dict "Values" .Values.extraIngress "Chart" .Chart "Release" .Release) }}
+{{ include "common.extra-ingress" (dict "Values" .Values.extraIngress "Chart" .Chart "Release" .Release) }}
 {{- end }}

example/templates/persistentvolumes.yaml

 {{- if .Values.volumes.persistentVolumes.example }}
-{{ include "common.persistentvolume.persistentvolume" (dict "Values" .Values.volumes.persistentVolumes.example "Chart" .Chart "Release" .Release) }}
+{{ include "common.persistentvolume" (dict "Values" .Values.volumes.persistentVolumes.example "Chart" .Chart "Release" .Release) }}
 {{- end }}

example/templates/secrets.yaml

 {{- if .Values.secrets.secret0 }}
-{{ include "common.secret.secret" (dict "Values" .Values.secrets.secret0 "Chart" .Chart "Release" .Release) }}
+{{ include "common.secret" (dict "Values" .Values.secrets.secret0 "Chart" .Chart "Release" .Release) }}
 {{- end }}
 {{- if .Values.secrets.secret1 }}
-{{ include "common.secret.secret" (dict "Values" .Values.secrets.secret1 "Chart" .Chart "Release" .Release) }}
+{{ include "common.secret" (dict "Values" .Values.secrets.secret1 "Chart" .Chart "Release" .Release) }}
 {{- end }}