Helm - Loki: Introduce runtimeConfig (#8179)

pull/8202/head^2 helm-loki-4.4.0
nervo 3 years ago committed by GitHub
parent 65bef5c360
commit 7aa596752d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      docs/sources/installation/helm/reference.md
  2. 4
      production/helm/loki/CHANGELOG.md
  3. 2
      production/helm/loki/Chart.yaml
  4. 2
      production/helm/loki/README.md
  5. 5
      production/helm/loki/templates/backend/statefulset-backend.yaml
  6. 5
      production/helm/loki/templates/read/deployment-read.yaml
  7. 5
      production/helm/loki/templates/read/statefulset-read.yaml
  8. 9
      production/helm/loki/templates/runtime-configmap.yaml
  9. 5
      production/helm/loki/templates/single-binary/statefulset.yaml
  10. 5
      production/helm/loki/templates/tokengen/job-tokengen.yaml
  11. 5
      production/helm/loki/templates/write/statefulset-write.yaml
  12. 6
      production/helm/loki/values.yaml

@ -1794,6 +1794,15 @@ true
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
<td>loki.runtimeConfig</td>
<td>object</td>
<td>Provides a reloadable runtime configuration file for some specific configuration</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>

@ -11,6 +11,10 @@ Entries should be ordered as follows:
Entries should include a reference to the pull request that introduced the change.
## 4.1.1
- [FEATURE] Added `loki.runtimeConfig` helm values to provide a reloadable runtime configuration.
## 4.1
- [BUGFIX] Fix bug in provisioner job that caused the self-monitoring tenant secret to be created with an empty token.

@ -4,7 +4,7 @@ name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 2.7.0
version: 4.3.0
version: 4.4.0
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki

@ -1,6 +1,6 @@
# loki
![Version: 4.3.0](https://img.shields.io/badge/Version-4.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square)
![Version: 4.4.0](https://img.shields.io/badge/Version-4.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square)
Helm chart for Grafana Loki in simple, scalable mode

@ -82,6 +82,8 @@ spec:
volumeMounts:
- name: config
mountPath: /etc/loki/config
- name: runtime-config
mountPath: /etc/loki/runtime-config
- name: data
mountPath: /var/loki
{{- if .Values.enterprise.enabled }}
@ -114,6 +116,9 @@ spec:
configMap:
name: {{ include "loki.name" . }}
{{- end }}
- name: runtime-config
configMap:
name: {{ template "loki.name" . }}-runtime
{{- if .Values.enterprise.enabled }}
- name: license
secret:

@ -90,6 +90,8 @@ spec:
volumeMounts:
- name: config
mountPath: /etc/loki/config
- name: runtime-config
mountPath: /etc/loki/runtime-config
- name: tmp
mountPath: /tmp
- name: data
@ -128,6 +130,9 @@ spec:
configMap:
name: {{ include "loki.name" . }}
{{- end }}
- name: runtime-config
configMap:
name: {{ template "loki.name" . }}-runtime
{{- if .Values.enterprise.enabled }}
- name: license
secret:

@ -101,6 +101,8 @@ spec:
volumeMounts:
- name: config
mountPath: /etc/loki/config
- name: runtime-config
mountPath: /etc/loki/runtime-config
- name: tmp
mountPath: /tmp
- name: data
@ -137,6 +139,9 @@ spec:
configMap:
name: {{ include "loki.name" . }}
{{- end }}
- name: runtime-config
configMap:
name: {{ template "loki.name" . }}-runtime
{{- if .Values.enterprise.enabled }}
- name: license
secret:

@ -0,0 +1,9 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "loki.name" . }}-runtime
labels:
{{- include "loki.labels" . | nindent 4 }}
data:
runtime-config.yaml: |
{{ tpl (toYaml .Values.loki.runtimeConfig) . | nindent 4 }}

@ -90,6 +90,8 @@ spec:
mountPath: /tmp
- name: config
mountPath: /etc/loki/config
- name: runtime-config
mountPath: /etc/loki/runtime-config
{{- if .Values.singleBinary.persistence.enabled }}
- name: storage
mountPath: /var/loki
@ -126,6 +128,9 @@ spec:
configMap:
name: {{ include "loki.name" . }}
{{- end }}
- name: runtime-config
configMap:
name: {{ template "loki.name" . }}-runtime
{{- if .Values.enterprise.enabled }}
- name: license
secret:

@ -60,6 +60,8 @@ spec:
mountPath: /shared
- name: config
mountPath: /etc/loki/config
- name: runtime-config
mountPath: /etc/loki/runtime-config
- name: license
mountPath: /etc/loki/license
env:
@ -110,6 +112,9 @@ spec:
configMap:
name: {{ include "loki.name" . }}
{{- end }}
- name: runtime-config
configMap:
name: {{ template "loki.name" . }}-runtime
- name: license
secret:
{{- if .Values.enterprise.useExternalLicense }}

@ -93,6 +93,8 @@ spec:
volumeMounts:
- name: config
mountPath: /etc/loki/config
- name: runtime-config
mountPath: /etc/loki/runtime-config
- name: data
mountPath: /var/loki
{{- if .Values.enterprise.enabled }}
@ -125,6 +127,9 @@ spec:
configMap:
name: {{ include "loki.name" . }}
{{- end }}
- name: runtime-config
configMap:
name: {{ template "loki.name" . }}-runtime
{{- if .Values.enterprise.enabled }}
- name: license
secret:

@ -113,6 +113,9 @@ loki:
{{- tpl (. | toYaml) $ | nindent 4 }}
{{- end }}
runtime_config:
file: /etc/loki/runtime-config/runtime-config.yaml
{{- with .Values.loki.memcached.chunk_cache }}
{{- if and .enabled (or .host .addresses) }}
chunk_store_config:
@ -213,6 +216,9 @@ loki:
max_cache_freshness_per_query: 10m
split_queries_by_interval: 15m
# -- Provides a reloadable runtime configuration file for some specific configuration
runtimeConfig: {}
# -- Check https://grafana.com/docs/loki/latest/configuration/#common_config for more info on how to provide a common configuration
commonConfig:
path_prefix: /var/loki

Loading…
Cancel
Save