From ac34257a190fff63d79c6b9ffeae3b4cc22a0f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Els=C5=91=20Andr=C3=A1s?= <elsoa@invitech.hu>
Date: Tue, 8 Oct 2024 13:42:59 +0200
Subject: [PATCH] Honor minio fullname

---
 .../templates/minio/create-bucket-job.yaml                | 4 ++--
 operations/helm/charts/mimir-distributed/values.yaml      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/operations/helm/charts/mimir-distributed/templates/minio/create-bucket-job.yaml b/operations/helm/charts/mimir-distributed/templates/minio/create-bucket-job.yaml
index 7750dbad1c9..e129b009767 100644
--- a/operations/helm/charts/mimir-distributed/templates/minio/create-bucket-job.yaml
+++ b/operations/helm/charts/mimir-distributed/templates/minio/create-bucket-job.yaml
@@ -58,9 +58,9 @@ spec:
           projected:
             sources:
             - configMap:
-                name: {{ .Release.Name }}-minio
+                name: {{ template "minio.fullname" .Subcharts.minio }}
             - secret:
-                name: {{ .Release.Name }}-minio
+                name: {{ template "minio.fullname" .Subcharts.minio }}
         {{- if .Values.minio.tls.enabled }}
         - name: cert-secret-volume-mc
           secret:
diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
index 33e14914cbf..33b17583836 100644
--- a/operations/helm/charts/mimir-distributed/values.yaml
+++ b/operations/helm/charts/mimir-distributed/values.yaml
@@ -140,7 +140,7 @@ mimir:
         s3:
           access_key_id: {{ .Values.minio.rootUser }}
           bucket_name: enterprise-metrics-admin
-          endpoint: {{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000
+          endpoint: {{ template "minio.fullname" .Subcharts.minio }}.{{ .Release.Namespace }}.svc:9000
           insecure: true
           secret_access_key: {{ .Values.minio.rootPassword }}
       {{- end }}
@@ -171,7 +171,7 @@ mimir:
       s3:
         access_key_id: {{ .Values.minio.rootUser }}
         bucket_name: {{ include "mimir.minioBucketPrefix" . }}-ruler
-        endpoint: {{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000
+        endpoint: {{ template "minio.fullname" .Subcharts.minio }}.{{ .Release.Namespace }}.svc:9000
         insecure: true
         secret_access_key: {{ .Values.minio.rootPassword }}
     {{- end }}
@@ -219,7 +219,7 @@ mimir:
       s3:
         access_key_id: {{ .Values.minio.rootUser }}
         bucket_name: {{ include "mimir.minioBucketPrefix" . }}-tsdb
-        endpoint: {{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000
+        endpoint: {{ template "minio.fullname" .Subcharts.minio }}.{{ .Release.Namespace }}.svc:9000
         insecure: true
         secret_access_key: {{ .Values.minio.rootPassword }}
       {{- end }}
@@ -374,7 +374,7 @@ mimir:
       {{- if .Values.minio.enabled }}
       backend: s3
       s3:
-        endpoint: {{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000
+        endpoint: {{ template "minio.fullname" .Subcharts.minio }}.{{ .Release.Namespace }}.svc:9000
         bucket_name: {{ include "mimir.minioBucketPrefix" . }}-ruler
         access_key_id: {{ .Values.minio.rootUser }}
         secret_access_key: {{ .Values.minio.rootPassword }}