Skip to content

[grafana] Make sidecar containers working #4046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sylvainOL wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[grafana] Make sidecar containers working #4046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6092ca0
fix: allow to use any method when in sidecar mode
sylvainOL Dec 9, 2025
696eee3
fix: always set `HEALTH_PORTS` on sidecar containers
sylvainOL Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions charts/grafana/templates/_pod.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,23 @@ initContainers:
valueFrom:
{{- tpl (toYaml $value) $ | nindent 10 }}
{{- end }}
{{- if .Values.sidecar.alerts.startupProbe }}
- name: HEALTH_PORT
value: "{{ .Values.sidecar.alerts.startupProbe.httpGet.port | default "8080" }}"
{{- end }}
value: "{{ .Values.sidecar.alerts.startupProbe.httpGet.port | default "8081" }}"
{{- if .Values.sidecar.alerts.ignoreAlreadyProcessed }}
- name: IGNORE_ALREADY_PROCESSED
value: "true"
{{- end }}
{{- if and .Values.sidecar.alerts.restartPolicy (eq .Values.sidecar.alerts.restartPolicy "Always")}}
- name: METHOD
value: {{ .Values.sidecar.alerts.watchMethod }}
{{- if eq .Values.sidecar.alerts.watchMethod "WATCH" }}
- name: REQ_SKIP_INIT
value: "true"
{{- end }}
{{- else }}
- name: METHOD
value: "LIST"
{{- end }}
- name: LABEL
value: "{{ tpl .Values.sidecar.alerts.label $root }}"
{{- with .Values.sidecar.alerts.labelValue }}
Expand Down Expand Up @@ -227,10 +234,8 @@ initContainers:
valueFrom:
{{- tpl (toYaml $value) $ | nindent 10 }}
{{- end }}
{{- if .Values.sidecar.datasources.startupProbe }}
- name: HEALTH_PORT
value: "{{ .Values.sidecar.datasources.startupProbe.httpGet.port | default "8081" }}"
{{- end }}
value: "{{ .Values.sidecar.datasources.startupProbe.httpGet.port | default "8082" }}"
{{- if .Values.sidecar.datasources.ignoreAlreadyProcessed }}
- name: IGNORE_ALREADY_PROCESSED
value: "true"
Expand Down Expand Up @@ -365,16 +370,23 @@ initContainers:
- name: "{{ $key }}"
value: "{{ $value }}"
{{- end }}
{{- if .Values.sidecar.notifiers.startupProbe }}
- name: HEALTH_PORT
value: "{{ .Values.sidecar.notifiers.startupProbe.httpGet.port | default "8082" }}"
{{- end }}
value: "{{ .Values.sidecar.notifiers.startupProbe.httpGet.port | default "8083" }}"
{{- if .Values.sidecar.notifiers.ignoreAlreadyProcessed }}
- name: IGNORE_ALREADY_PROCESSED
value: "true"
{{- end }}
{{- if and .Values.sidecar.notifiers.restartPolicy (eq .Values.sidecar.notifiers.restartPolicy "Always")}}
- name: METHOD
value: {{ .Values.sidecar.notifiers.watchMethod }}
{{- if eq .Values.sidecar.notifiers.watchMethod "WATCH" }}
- name: REQ_SKIP_INIT
value: "true"
{{- end }}
{{- else }}
- name: METHOD
value: LIST
{{- end }}
- name: LABEL
value: "{{ tpl .Values.sidecar.notifiers.label $root }}"
{{- with .Values.sidecar.notifiers.labelValue }}
Expand Down Expand Up @@ -454,10 +466,8 @@ initContainers:
valueFrom:
{{- tpl (toYaml $value) $ | nindent 10 }}
{{- end }}
{{- if .Values.sidecar.dashboards.startupProbe }}
- name: HEALTH_PORT
value: "{{ .Values.sidecar.dashboards.startupProbe.httpGet.port | default "8083" }}"
{{- end }}
value: "{{ .Values.sidecar.dashboards.startupProbe.httpGet.port | default "8084" }}"
{{- if .Values.sidecar.dashboards.ignoreAlreadyProcessed }}
- name: IGNORE_ALREADY_PROCESSED
value: "true"
Expand Down