fix loki config volume hardcode (#13082)

Signed-off-by: cleverhu <shouping.hu@daocloud.io>

Signed-off-by: cleverhu <shouping.hu@daocloud.io>
This commit is contained in:
cleverhu
2022-10-24 17:23:12 +08:00
committed by GitHub
parent 5f54916bb5
commit 5764e11ccb
4 changed files with 6 additions and 6 deletions

View File

@@ -44,4 +44,4 @@ name: grafana-loki
sources:
- https://github.com/bitnami/containers/tree/main/bitnami/grafana-loki
- https://github.com/grafana/loki/
version: 2.4.5
version: 2.4.6

View File

@@ -117,7 +117,7 @@ spec:
{{- else }}
args:
- -target=ingester
- -config.file=/bitnami/grafana-loki/conf/loki.yaml
- -config.file={{ .Values.loki.dataDir }}/conf/loki.yaml
{{- end }}
{{- if .Values.ingester.extraEnvVars }}
env: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.extraEnvVars "context" $) | nindent 12 }}
@@ -169,7 +169,7 @@ spec:
{{- end }}
volumeMounts:
- name: loki-config
mountPath: /bitnami/grafana-loki/conf/loki.yaml
mountPath: {{ .Values.loki.dataDir }}/conf/loki.yaml
subPath: loki.yaml
- name: data
mountPath: {{ .Values.loki.dataDir }}

View File

@@ -145,7 +145,7 @@ spec:
{{- end }}
volumeMounts:
- name: loki-config
mountPath: /bitnami/grafana-loki/conf/loki.yaml
mountPath: {{ .Values.loki.dataDir }}/conf/loki.yaml
subPath: loki.yaml
{{- if .Values.queryFrontend.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.extraVolumeMounts "context" $) | nindent 12 }}

View File

@@ -92,7 +92,7 @@ spec:
args: {{- include "common.tplvalues.render" (dict "value" .Values.queryScheduler.args "context" $) | nindent 12 }}
{{- else }}
args:
- '-config.file=/bitnami/grafana-loki/conf/loki.yaml'
- '-config.file={{ .Values.loki.dataDir }}/conf/loki.yaml'
- -log.level=debug
- -target=query-scheduler
{{- end }}
@@ -146,7 +146,7 @@ spec:
{{- end }}
volumeMounts:
- name: loki-config
mountPath: /bitnami/grafana-loki/conf/loki.yaml
mountPath: {{ .Values.loki.dataDir }}/conf/loki.yaml
subPath: loki.yaml
{{- if .Values.queryScheduler.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.queryScheduler.extraVolumeMounts "context" $) | nindent 12 }}