Merge branch 'main' into hostAliases_for_loki-distributed

grafana · Jul 31, 2023 · ef55a63 · ef55a63
2 parents 03ae555 + 0f3c19f
commit ef55a63
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
@@ -266,6 +266,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA
 | ingester.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `loki.image.tag` |
 | ingester.initContainers | list | `[]` | Init containers to add to the ingester pods |
 | ingester.kind | string | `"StatefulSet"` | Kind of deployment [StatefulSet/Deployment] |
+| ingester.lifecycle | object | `{}` | Lifecycle for the ingester container |
 | ingester.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` |
 | ingester.maxSurge | int | `0` | Max Surge for ingester pods |
 | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable |

diff --git a/charts/loki-distributed/templates/ingester/deployment-ingester.yaml b/charts/loki-distributed/templates/ingester/deployment-ingester.yaml
@@ -106,6 +106,10 @@ spec:
             {{- end }}
           resources:
             {{- toYaml .Values.ingester.resources | nindent 12 }}
+          {{- with .Values.ingester.lifecycle }}
+          lifecycle:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
         {{- if .Values.ingester.extraContainers }}
         {{- toYaml .Values.ingester.extraContainers | nindent 8}}
         {{- end }}

diff --git a/charts/loki-distributed/templates/ingester/statefulset-ingester.yaml b/charts/loki-distributed/templates/ingester/statefulset-ingester.yaml
@@ -117,6 +117,10 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.ingester.lifecycle }}
+          lifecycle:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
         {{- if .Values.ingester.extraContainers }}
         {{- toYaml .Values.ingester.extraContainers | nindent 8}}
         {{- end }}

diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml
@@ -430,6 +430,8 @@ ingester:
   # this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring
   # all data and to successfully leave the member ring on shutdown.
   terminationGracePeriodSeconds: 300
+  # -- Lifecycle for the ingester container
+  lifecycle: {}
   # -- topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string
   # @default -- Defaults to allow skew no more then 1 node per AZ
   topologySpreadConstraints: |