Add support for Helm namespace override

operations/helm/charts/mimir-distributed/CHANGELOG.md

@@ -28,6 +28,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 
 ## main / unreleased
 
+* [ENHANCEMENT] Add `namespaceOverride` option to change default Helm namespace installation behavior.
 * [CHANGE] Do not render resource blocks for `initContainers`, `nodeSelector`, `affinity` and `tolerations` if they are empty.
 * [CHANGE] Rollout-operator: remove default CPU limit. #7125
 * [CHANGE] Ring: relaxed the hash ring heartbeat period and timeout for distributor, ingester, store-gateway and compactor: #6860

operations/helm/charts/mimir-distributed/templates/_helpers.tpl

@@ -6,6 +6,13 @@ Expand the name of the chart.
 {{- default ( include "mimir.infixName" . ) .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Override Namespace for multi-chart deployments.
+*/}}
+{{- define "mimir.namespace" -}}
+{{- default $.Release.Namespace $.Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -36,9 +43,9 @@ Calculate the gateway url
 */}}
 {{- define "mimir.gatewayUrl" -}}
 {{- if eq (include "mimir.gateway.isEnabled" . ) "true" -}}
-http://{{ include "mimir.gateway.service.name" . }}.{{ .Release.Namespace }}.svc:{{ .Values.gateway.service.port | default (include "mimir.serverHttpListenPort" . ) }}
+http://{{ include "mimir.gateway.service.name" . }}.{{ include "mimir.namespace" . }}.svc:{{ .Values.gateway.service.port | default (include "mimir.serverHttpListenPort" . ) }}
 {{- else -}}
-http://{{ template "mimir.fullname" . }}-nginx.{{ .Release.Namespace }}.svc:{{ .Values.nginx.service.port }}
+http://{{ template "mimir.fullname" . }}-nginx.{{ include "mimir.namespace" . }}.svc:{{ .Values.nginx.service.port }}
 {{- end -}}
 {{- end -}}
 
@@ -160,23 +167,23 @@ Alertmanager cluster bind address
 {{- end -}}
 
 {{- define "mimir.chunksCacheAddress" -}}
-dns+{{ template "mimir.fullname" . }}-chunks-cache.{{ .Release.Namespace }}.svc:{{ (index .Values "chunks-cache").port }}
+dns+{{ template "mimir.fullname" . }}-chunks-cache.{{ include "mimir.namespace" . }}.svc:{{ (index .Values "chunks-cache").port }}
 {{- end -}}
 
 {{- define "mimir.indexCacheAddress" -}}
-dns+{{ template "mimir.fullname" . }}-index-cache.{{ .Release.Namespace }}.svc:{{ (index .Values "index-cache").port }}
+dns+{{ template "mimir.fullname" . }}-index-cache.{{ include "mimir.namespace" . }}.svc:{{ (index .Values "index-cache").port }}
 {{- end -}}
 
 {{- define "mimir.metadataCacheAddress" -}}
-dns+{{ template "mimir.fullname" . }}-metadata-cache.{{ .Release.Namespace }}.svc:{{ (index .Values "metadata-cache").port }}
+dns+{{ template "mimir.fullname" . }}-metadata-cache.{{ include "mimir.namespace" . }}.svc:{{ (index .Values "metadata-cache").port }}
 {{- end -}}
 
 {{- define "mimir.resultsCacheAddress" -}}
-dns+{{ template "mimir.fullname" . }}-results-cache.{{ .Release.Namespace }}.svc:{{ (index .Values "results-cache").port }}
+dns+{{ template "mimir.fullname" . }}-results-cache.{{ include "mimir.namespace" . }}.svc:{{ (index .Values "results-cache").port }}
 {{- end -}}
 
 {{- define "mimir.adminCacheAddress" -}}
-dns+{{ template "mimir.fullname" . }}-admin-cache.{{ .Release.Namespace }}.svc:{{ (index .Values "admin-cache").port }}
+dns+{{ template "mimir.fullname" . }}-admin-cache.{{ include "mimir.namespace" . }}.svc:{{ (index .Values "admin-cache").port }}
 {{- end -}}
 
 {{/*

operations/helm/charts/mimir-distributed/templates/admin-api/admin-api-dep.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     {{- include "mimir.labels" (dict "ctx" . "component" "admin-api" "memberlist" true) | nindent 4 }}
   name: {{ include "mimir.resourceName" (dict "ctx" . "component" "admin-api") }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   replicas: {{ .Values.admin_api.replicas }}
   selector:
@@ -21,7 +21,7 @@ spec:
         {{- include "mimir.podLabels" (dict "ctx" . "component" "admin-api" "memberlist" true) | nindent 8 }}
       annotations:
         {{- include "mimir.podAnnotations" (dict "ctx" . "component" "admin-api") | nindent 8 }}
-      namespace: {{ .Release.Namespace | quote }}
+      namespace: {{ include "mimir.namespace" . | quote }}
     spec:
       serviceAccountName: {{ template "mimir.serviceAccountName" . }}
       {{- if .Values.admin_api.priorityClassName }}

operations/helm/charts/mimir-distributed/templates/admin-api/admin-api-svc.yaml

@@ -10,7 +10,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .Values.admin_api.service.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   ports:

operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-config.yaml

@@ -8,7 +8,7 @@ metadata:
     {{- include "mimir.labels" (dict "ctx" . "component" "alertmanager" "memberlist" true) | nindent 4 }}
   annotations:
   {{- toYaml .Values.alertmanager.annotations | nindent 4 }} 
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 data:
   alertmanager_fallback_config.yaml: |
     {{- .Values.alertmanager.fallbackConfig | nindent 4 }}

operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-dep.yaml

@@ -8,7 +8,7 @@ metadata:
     {{- include "mimir.labels" (dict "ctx" . "component" "alertmanager" "memberlist" true) | nindent 4 }}
   annotations:
     {{- toYaml .Values.alertmanager.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   replicas: {{ .Values.alertmanager.replicas }}
   selector:
@@ -25,7 +25,7 @@ spec:
         {{- if .Values.alertmanager.fallbackConfig }}
         checksum/alertmanager-fallback-config: {{ include (print .Template.BasePath "/alertmanager/alertmanager-config.yaml") . | sha256sum }}
         {{- end }}
-      namespace: {{ .Release.Namespace | quote }}
+      namespace: {{ include "mimir.namespace" . | quote }}
     spec:
       serviceAccountName: {{ template "mimir.serviceAccountName" . }}
       {{- if .Values.alertmanager.priorityClassName }}

operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml

@@ -13,7 +13,7 @@ metadata:
     {{- include "mimir.labels" $args | nindent 4 }}
   annotations:
     {{- include "mimir.componentAnnotations" $args | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   replicas: {{ $rolloutZone.replicas }}
   {{- if and (semverCompare ">= 1.23-0" (include "mimir.kubeVersion" .)) (.Values.alertmanager.persistentVolume.enableRetentionPolicy)  }}
@@ -63,7 +63,7 @@ spec:
         {{- if .Values.alertmanager.fallbackConfig }}
         checksum/alertmanager-fallback-config: {{ include (print .Template.BasePath "/alertmanager/alertmanager-config.yaml") . | sha256sum }}
         {{- end }}
-      namespace: {{ .Release.Namespace | quote }}
+      namespace: {{ include "mimir.namespace" . | quote }}
     spec:
       {{- with .Values.alertmanager.schedulerName }}
       schedulerName: {{ . | quote }}

operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml

@@ -12,7 +12,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .Values.alertmanager.service.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   clusterIP: None

operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml

@@ -19,7 +19,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .Values.alertmanager.service.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   ports:

operations/helm/charts/mimir-distributed/templates/compactor/compactor-statefulset.yaml

@@ -6,7 +6,7 @@ metadata:
     {{- include "mimir.labels" (dict "ctx" . "component" "compactor" "memberlist" true) | nindent 4 }}
   annotations:
     {{- toYaml .Values.compactor.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   podManagementPolicy: {{ .Values.compactor.podManagementPolicy }}
   {{- if and (semverCompare ">= 1.23-0" (include "mimir.kubeVersion" .)) (.Values.compactor.persistentVolume.enableRetentionPolicy)  }}
@@ -49,7 +49,7 @@ spec:
         {{- include "mimir.podLabels" (dict "ctx" . "component" "compactor" "memberlist" true) | nindent 8 }}
       annotations:
         {{- include "mimir.podAnnotations" (dict "ctx" . "component" "compactor") | nindent 8 }}
-      namespace: {{ .Release.Namespace | quote }}
+      namespace: {{ include "mimir.namespace" . | quote }}
     spec:
       {{- with .Values.compactor.schedulerName }}
       schedulerName: {{ . | quote }}

operations/helm/charts/mimir-distributed/templates/compactor/compactor-svc.yaml

@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .Values.compactor.service.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   ports:

operations/helm/charts/mimir-distributed/templates/continuous_test/continuous-test-dep.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     {{- include "mimir.labels" (dict "ctx" . "component" "continuous-test") | nindent 4 }}
   name: {{ include "mimir.resourceName" (dict "ctx" . "component" "continuous-test") }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   replicas: {{ .Values.continuous_test.replicas }}
   selector:
@@ -21,7 +21,7 @@ spec:
         {{- include "mimir.podLabels" (dict "ctx" . "component" "continuous-test") | nindent 8 }}
       annotations:
         {{- include "mimir.podAnnotations" (dict "ctx" . "component" "continuous-test") | nindent 8 }}
-      namespace: {{ .Release.Namespace | quote }}
+      namespace: {{ include "mimir.namespace" . | quote }}
     spec:
       serviceAccountName: {{ template "mimir.serviceAccountName" . }}
       {{- if .Values.continuous_test.priorityClassName }}

operations/helm/charts/mimir-distributed/templates/continuous_test/continuous-test-svc-headless.yaml

@@ -10,7 +10,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .Values.continuous_test.service.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   clusterIP: None

operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml

@@ -6,7 +6,7 @@ metadata:
     {{- include "mimir.labels" (dict "ctx" . "component" "distributor" "memberlist" true) | nindent 4 }}
   annotations:
     {{- toYaml .Values.distributor.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   {{- if not .Values.distributor.kedaAutoscaling.enabled }}
   # If replicas is not number (when using values file it's float64, when using --set arg it's int64) and is false (i.e. null) don't set it
@@ -25,7 +25,7 @@ spec:
         {{- include "mimir.podLabels" (dict "ctx" . "component" "distributor" "memberlist" true) | nindent 8 }}
       annotations:
         {{- include "mimir.podAnnotations" (dict "ctx" . "component" "distributor") | nindent 8 }}
-      namespace: {{ .Release.Namespace | quote }}
+      namespace: {{ include "mimir.namespace" . | quote }}
     spec:
       serviceAccountName: {{ template "mimir.serviceAccountName" . }}
       {{- if .Values.distributor.priorityClassName }}

operations/helm/charts/mimir-distributed/templates/distributor/distributor-so.yaml

@@ -7,7 +7,7 @@ metadata:
     {{- include "mimir.labels" (dict "ctx" . "component" "distributor") | nindent 4 }}
   annotations:
     {{- toYaml .Values.distributor.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   advanced:
     horizontalPodAutoscalerConfig:
@@ -24,7 +24,7 @@ spec:
     kind: Deployment
   triggers:
   - metadata:
-      query: max_over_time(sum(sum by (pod) (rate(container_cpu_usage_seconds_total{container="distributor",namespace="{{ .Release.Namespace }}"}[5m])) and max by (pod) (up{container="distributor",namespace="{{ .Release.Namespace }}"}) > 0)[15m:]) * 1000
+      query: max_over_time(sum(sum by (pod) (rate(container_cpu_usage_seconds_total{container="distributor",namespace="{{ include "mimir.namespace" . }}"}[5m])) and max by (pod) (up{container="distributor",namespace="{{ include "mimir.namespace" . }}"}) > 0)[15m:]) * 1000
       serverAddress: {{ include "mimir.kedaPrometheusAddress" (dict "ctx" $) }} 
       {{- $cpu_request := dig "requests" "cpu" nil .Values.distributor.resources }}
       threshold: {{ mulf (include "mimir.cpuToMilliCPU" (dict "value" $cpu_request)) (divf .Values.distributor.kedaAutoscaling.targetCPUUtilizationPercentage 100) | floor | int64 | quote }}
@@ -33,7 +33,7 @@ spec:
       {{- end }}
     type: prometheus
   - metadata:
-      query: max_over_time(sum((sum by (pod) (container_memory_working_set_bytes{container="distributor",namespace="{{ .Release.Namespace }}"}) and max by (pod) (up{container="distributor",namespace="{{ .Release.Namespace }}"}) > 0) or vector(0))[15m:]) + sum(sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="distributor",namespace="{{ .Release.Namespace }}", resource="memory"}[15m])) and max by (pod) (changes(kube_pod_container_status_restarts_total{container="distributor",namespace="{{ .Release.Namespace }}"}[15m]) > 0) and max by (pod) (kube_pod_container_status_last_terminated_reason{container="distributor",namespace="{{ .Release.Namespace }}", reason="OOMKilled"}) or vector(0))
+      query: max_over_time(sum((sum by (pod) (container_memory_working_set_bytes{container="distributor",namespace="{{ include "mimir.namespace" . }}"}) and max by (pod) (up{container="distributor",namespace="{{ include "mimir.namespace" . }}"}) > 0) or vector(0))[15m:]) + sum(sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="distributor",namespace="{{ include "mimir.namespace" . }}", resource="memory"}[15m])) and max by (pod) (changes(kube_pod_container_status_restarts_total{container="distributor",namespace="{{ include "mimir.namespace" . }}"}[15m]) > 0) and max by (pod) (kube_pod_container_status_last_terminated_reason{container="distributor",namespace="{{ include "mimir.namespace" . }}", reason="OOMKilled"}) or vector(0))
       serverAddress: {{ include "mimir.kedaPrometheusAddress" (dict "ctx" $) }} 
       {{- $mem_request := dig "requests" "memory" nil .Values.distributor.resources }}
       threshold: {{ mulf (include "mimir.siToBytes" (dict "value" $mem_request)) (divf .Values.distributor.kedaAutoscaling.targetMemoryUtilizationPercentage 100) | floor | int64 | quote }}

operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc-headless.yaml

@@ -10,7 +10,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .Values.distributor.service.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   clusterIP: None

operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc.yaml

@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .Values.distributor.service.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   ports:

operations/helm/charts/mimir-distributed/templates/gateway/gateway-dep.yaml

@@ -9,7 +9,7 @@ metadata:
   labels:
     {{- include "mimir.labels" (dict "ctx" $ "component" "gateway") | nindent 4 }}
   name: {{ include "mimir.resourceName" (dict "ctx" $ "component" "gateway") }}
-  namespace: {{ $.Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" $ | quote }}
 spec:
 {{- if not .autoscaling.enabled }}
   replicas: {{ .replicas }}
@@ -31,7 +31,9 @@ spec:
         {{- $annotations = (dict "checksum/config" (include (print $.Template.BasePath "/gateway/nginx-configmap.yaml") $ | sha256sum )) | mergeOverwrite $annotations -}}
         {{- end -}}
         {{- $annotations | toYaml | nindent 8 }}
-      namespace: {{ $.Release.Namespace | quote }}
+      {{- with $ }}
+      namespace: {{ include "mimir.namespace" . | quote }}
+      {{- end }}
     spec:
       serviceAccountName: {{ include "mimir.serviceAccountName" $ }}
       {{- if .priorityClassName }}

operations/helm/charts/mimir-distributed/templates/gateway/gateway-ingress.yaml

@@ -9,7 +9,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   {{- with .Values.gateway.ingress.ingressClassName }}
   ingressClassName: {{ . }}

operations/helm/charts/mimir-distributed/templates/gateway/gateway-route.yaml

@@ -9,7 +9,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   host: {{ tpl .Values.gateway.route.host  $ | quote }}
   to:

operations/helm/charts/mimir-distributed/templates/gateway/gateway-svc.yaml

@@ -11,7 +11,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .service.annotations | nindent 4 }}
-  namespace: {{ $.Release.Namespace | quote }}
+  namespace: {{ default (include "mimir.namespace" $ ) | quote }}
 spec:
   type: {{ .service.type }}
   {{- with .service.clusterIP }}

operations/helm/charts/mimir-distributed/templates/gateway/gateway-v2-hpa.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ include "mimir.resourceName" (dict "ctx" . "component" "gateway") }}
   labels:
     {{- include "mimir.labels" (dict "ctx" . "component" "gateway") | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

operations/helm/charts/mimir-distributed/templates/gateway/gateway-v2beta1-hpa.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ include "mimir.resourceName" (dict "ctx" . "component" "gateway") }}
   labels:
     {{- include "mimir.labels" (dict "ctx" . "component" "gateway") | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

operations/helm/charts/mimir-distributed/templates/gateway/nginx-configmap.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ include "mimir.resourceName" (dict "ctx" . "component" "gateway-nginx") }}
   labels:
     {{- include "mimir.labels" (dict "ctx" . "component" "gateway-nginx") | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 data:
   nginx.conf: |
     {{- tpl .Values.gateway.nginx.config.file . | nindent 4 }}

operations/helm/charts/mimir-distributed/templates/gateway/nginx-secret.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ include "mimir.resourceName" (dict "ctx" . "component" "gateway-nginx") }}
   labels:
     {{- include "mimir.labels" (dict "ctx" . "component" "gateway-nginx") | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 stringData:
   .htpasswd: |
     {{- tpl .Values.gateway.nginx.basicAuth.htpasswd $ | nindent 4 }}

operations/helm/charts/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ include "mimir.resourceName" (dict "ctx" . "component" "gossip-ring") }}
   labels:
     {{- include "mimir.labels" (dict "ctx" . "component" "gossip-ring") | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   clusterIP: None

operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-dep.yaml

@@ -7,7 +7,7 @@ metadata:
     {{- include "mimir.labels" (dict "ctx" . "component" "graphite-querier") | nindent 4 }}
   annotations:
     {{- toYaml .Values.graphite.querier.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   replicas: {{ .Values.graphite.querier.replicas }}
   selector:
@@ -21,7 +21,7 @@ spec:
         {{- include "mimir.podLabels" (dict "ctx" . "component" "graphite-querier") | nindent 8 }}
       annotations:
         {{- include "mimir.podAnnotations" (dict "ctx" . "component" "graphite-querier") | nindent 8 }}
-      namespace: {{ .Release.Namespace | quote }}
+      namespace: {{ include "mimir.namespace" . | quote }}
     spec:
       serviceAccountName: {{ template "mimir.serviceAccountName" . }}
       {{- if .Values.graphite.querier.priorityClassName }}

operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-schemas-configmap.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ include "mimir.resourceName" (dict "ctx" . "component" "graphite-schemas") }}
   labels:
     {{- include "mimir.labels" (dict "ctx" . "component" "graphite-schemas") | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 data:
   storage-schemas.conf: |
 {{ .Values.graphite.querier.schemasConfiguration.storageSchemas | indent 4 }}

operations/helm/charts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-svc.yaml

@@ -10,7 +10,7 @@ metadata:
     {{- end }}
   annotations:
     {{- toYaml .Values.graphite.querier.service.annotations | nindent 4 }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "mimir.namespace" . | quote }}
 spec:
   type: ClusterIP
   ports: