diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index d3fa17defa554..78536fefe3386 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -5661,6 +5661,7 @@ null "tag": null }, "initContainers": [], + "labels": {}, "lifecycle": {}, "livenessProbe": {}, "maxUnavailable": 1, diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 4c4139431b1d6..ae48bde2c0ee5 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,7 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.) +- [FEATURE] Allow setting custom labels for ingester statefulsets [#18536](https://github.com/grafana/loki/pull/18536) - [BUGFIX] Ensure the scc is actually allowing to use hostPath volumes when the rbac.sccAllowHostDirVolumePlugin is set to true - [BUGFIX] Fix serviceName in zone-aware ingester statefulsets [#18558](https://github.com/grafana/loki/pull/18558) - [FEATURE] Added support for chunk-cache-l2 [#17556](https://github.com/grafana/loki/pull/17556) diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml index 2b50a5dd57736..8c43dc4280dd1 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml @@ -11,6 +11,9 @@ metadata: app.kubernetes.io/part-of: memberlist name: {{ include "loki.prefixIngesterName" . }}ingester-zone-a rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester + {{- with .Values.ingester.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: rollout-max-unavailable: "{{ include "loki.ingester.maxUnavailable" (dict "ctx" . "replicas" $replicas)}}" {{- with .Values.loki.annotations }} diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml index 501596ebba3ac..f6e669eac52e4 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml @@ -11,6 +11,9 @@ metadata: app.kubernetes.io/part-of: memberlist name: {{ include "loki.prefixIngesterName" . }}ingester-zone-b rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester + {{- with .Values.ingester.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: rollout-max-unavailable: "{{ include "loki.ingester.maxUnavailable" (dict "ctx" . "replicas" $replicas)}}" {{- with .Values.loki.annotations }} diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml index 210deae059597..0667ca8fac42b 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml @@ -11,6 +11,9 @@ metadata: app.kubernetes.io/part-of: memberlist name: {{ include "loki.prefixIngesterName" . }}ingester-zone-c rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester + {{- with .Values.ingester.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: rollout-max-unavailable: "{{ include "loki.ingester.maxUnavailable" (dict "ctx" . "replicas" $replicas)}}" {{- with .Values.loki.annotations }} diff --git a/production/helm/loki/templates/ingester/statefulset-ingester.yaml b/production/helm/loki/templates/ingester/statefulset-ingester.yaml index 9055fe2968bc9..79d4e06ec51ed 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester.yaml @@ -8,6 +8,9 @@ metadata: labels: {{- include "loki.ingesterLabels" . | nindent 4 }} app.kubernetes.io/part-of: memberlist + {{- with .Values.ingester.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.loki.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 0a5c640ff7c93..3a091316fcf60 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -1906,6 +1906,7 @@ ingester: tag: null # -- Command to execute instead of defined in Docker image command: null + labels: {} priorityClassName: null # -- Labels for ingester pods podLabels: {}