diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md index 9ef45eec34f..acf96b39916 100644 --- a/operations/helm/charts/mimir-distributed/CHANGELOG.md +++ b/operations/helm/charts/mimir-distributed/CHANGELOG.md @@ -32,6 +32,7 @@ Entries should include a reference to the Pull Request that introduced the chang * [ENHANCEMENT] Add support for setting type and internal traffic policy for Kubernetes service. Set `internalTrafficPolicy=Cluster` by default in all services with type `ClusterIP`. #9619 * [ENHANCEMENT] Add the possibility to create a dedicated serviceAccount for the `alertmanager` component by setting `alertmanager.serviceAcount.create` to true in the values. #9781 * [BUGFIX] Fix PVC template in AlertManager to not show diff in ArgoCD. #9774 +* [BUGFIX] Fix how `fullnameOverride` is reflected in generated manifests. #9564 ## 5.5.1 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..5c92e40cca3 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: @@ -76,7 +76,7 @@ spec: command: ["/bin/sh", "/config/initialize"] env: - name: MINIO_ENDPOINT - value: {{ .Release.Name }}-minio + value: {{ template "minio.fullname" .Subcharts.minio }} - name: MINIO_PORT value: {{ .Values.minio.service.port | quote }} volumeMounts: diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index cb955378471..607dc91f689 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:{{ .Values.minio.service.port }} 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:{{ .Values.minio.service.port }} 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:{{ .Values.minio.service.port }} 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:{{ .Values.minio.service.port }} bucket_name: {{ include "mimir.minioBucketPrefix" . }}-ruler access_key_id: {{ .Values.minio.rootUser }} secret_access_key: {{ .Values.minio.rootPassword }}