Use namespaces

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>

bitnami/apache/templates/_helpers.tpl

@@ -76,7 +76,7 @@ imagePullSecrets:
 {{/*
 Return the proper image name (for the metrics image)
 */}}
-{{- define "metrics.image" -}}
+{{- define "apache.metrics.image" -}}
 {{- $registryName := .Values.metrics.image.registry -}}
 {{- $repositoryName := .Values.metrics.image.repository -}}
 {{- $tag := .Values.metrics.image.tag | toString -}}

bitnami/apache/templates/deployment.yaml

@@ -63,7 +63,7 @@ spec:
           mountPath: /bitnami/apache
 {{- if .Values.metrics.enabled }}
       - name: metrics
-        image: {{ template "metrics.image" . }}
+        image: {{ template "apache.metrics.image" . }}
         imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
         command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:8080/server-status/?auto']
         ports: