From bae3ce6a47b36bb3046ee9c68b44b169bfa8b383 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Mon, 20 Jan 2025 19:58:13 +0200 Subject: [PATCH 1/3] add headless annotations for headless service annotations in distributor Signed-off-by: AvivGuiser --- .../templates/distributor/distributor-svc-headless.yaml | 2 +- operations/helm/charts/mimir-distributed/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc-headless.yaml b/operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc-headless.yaml index aae207d8596..d74d5c1e48f 100644 --- a/operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc-headless.yaml +++ b/operations/helm/charts/mimir-distributed/templates/distributor/distributor-svc-headless.yaml @@ -10,7 +10,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} annotations: - {{- toYaml .Values.distributor.service.annotations | nindent 4 }} + {{- toYaml .Values.distributor.service.headlessAnnotations | nindent 4 }} namespace: {{ .Release.Namespace | quote }} spec: type: ClusterIP diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index bc693d2232d..b4f8a08109a 100644 --- a/operations/helm/charts/mimir-distributed/values.yaml +++ b/operations/helm/charts/mimir-distributed/values.yaml @@ -853,6 +853,7 @@ distributor: service: annotations: {} + headlessAnnotations: {} labels: {} # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ internalTrafficPolicy: Cluster From 4d12b13bc888e4f30aac82f6437f34653f303087 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Mon, 20 Jan 2025 20:01:51 +0200 Subject: [PATCH 2/3] update changelog Signed-off-by: AvivGuiser --- operations/helm/charts/mimir-distributed/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md index 0f277626446..5229c03dde2 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 * [CHANGE] Memcached: Update to Memcached 1.6.34. #10318 * [ENHANCEMENT] Minio: update subchart to v5.4.0. #10346 * [ENHANCEMENT] Individual mimir components can override their container images via the *.image values. The component's image definitions always override the values set in global `image` or `enterprise.image`. #10340 +* [ENHANCEMENT] allow setting different annotations for headless service in the distributor #10485 * [BUGFIX] Fix calculation of `mimir.siToBytes` and use floating point arithmetics. #10044 ## 5.6.0 From a22edb941016d9ccac76a913b8eeb2dc63b21eb7 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 10 Feb 2025 20:24:16 +0100 Subject: [PATCH 3/3] Update operations/helm/charts/mimir-distributed/CHANGELOG.md Co-authored-by: Taylor C <41653732+tacole02@users.noreply.github.com> --- operations/helm/charts/mimir-distributed/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md index 5229c03dde2..cbd7386fc3d 100644 --- a/operations/helm/charts/mimir-distributed/CHANGELOG.md +++ b/operations/helm/charts/mimir-distributed/CHANGELOG.md @@ -32,7 +32,7 @@ Entries should include a reference to the Pull Request that introduced the chang * [CHANGE] Memcached: Update to Memcached 1.6.34. #10318 * [ENHANCEMENT] Minio: update subchart to v5.4.0. #10346 * [ENHANCEMENT] Individual mimir components can override their container images via the *.image values. The component's image definitions always override the values set in global `image` or `enterprise.image`. #10340 -* [ENHANCEMENT] allow setting different annotations for headless service in the distributor #10485 +* [ENHANCEMENT] Allow setting different annotations for headless service in the distributor #10485 * [BUGFIX] Fix calculation of `mimir.siToBytes` and use floating point arithmetics. #10044 ## 5.6.0