Skip to content

Commit b04a50a

Browse files
okozachenko1203trevorwhitney
authored andcommitted
feat: support ruler sidecar in singleBinary mode (grafana#13572)
Co-authored-by: Trevor Whitney <[email protected]>
1 parent 4e4d74a commit b04a50a

File tree

3 files changed

+84
-3
lines changed

3 files changed

+84
-3
lines changed

production/helm/loki/templates/backend/clusterrole.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}}
2-
{{- if and $isSimpleScalable (not .Values.rbac.namespaced) (not .Values.rbac.useExistingRole) }}
1+
{{- if and (not .Values.rbac.namespaced) (not .Values.rbac.useExistingRole) }}
32
kind: ClusterRole
43
apiVersion: rbac.authorization.k8s.io/v1
54
metadata:

production/helm/loki/templates/backend/clusterrolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}}
2-
{{- if and $isSimpleScalable (not .Values.rbac.namespaced) }}
2+
{{- if (not .Values.rbac.namespaced) }}
33
kind: ClusterRoleBinding
44
apiVersion: rbac.authorization.k8s.io/v1
55
metadata:

production/helm/loki/templates/single-binary/statefulset.yaml

+82
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,75 @@ spec:
7979
{{- end }}
8080
{{- end }}
8181
containers:
82+
{{- if .Values.sidecar.rules.enabled }}
83+
- name: loki-sc-rules
84+
{{- if .Values.sidecar.image.sha }}
85+
image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
86+
{{- else }}
87+
image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
88+
{{- end }}
89+
imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }}
90+
env:
91+
- name: METHOD
92+
value: {{ .Values.sidecar.rules.watchMethod }}
93+
- name: LABEL
94+
value: "{{ .Values.sidecar.rules.label }}"
95+
{{- if .Values.sidecar.rules.labelValue }}
96+
- name: LABEL_VALUE
97+
value: {{ quote .Values.sidecar.rules.labelValue }}
98+
{{- end }}
99+
- name: FOLDER
100+
value: "{{ .Values.sidecar.rules.folder }}"
101+
- name: RESOURCE
102+
value: {{ quote .Values.sidecar.rules.resource }}
103+
{{- if .Values.sidecar.enableUniqueFilenames }}
104+
- name: UNIQUE_FILENAMES
105+
value: "{{ .Values.sidecar.enableUniqueFilenames }}"
106+
{{- end }}
107+
{{- if .Values.sidecar.rules.searchNamespace }}
108+
- name: NAMESPACE
109+
value: "{{ .Values.sidecar.rules.searchNamespace | join "," }}"
110+
{{- end }}
111+
{{- if .Values.sidecar.skipTlsVerify }}
112+
- name: SKIP_TLS_VERIFY
113+
value: "{{ .Values.sidecar.skipTlsVerify }}"
114+
{{- end }}
115+
{{- if .Values.sidecar.rules.script }}
116+
- name: SCRIPT
117+
value: "{{ .Values.sidecar.rules.script }}"
118+
{{- end }}
119+
{{- if .Values.sidecar.rules.watchServerTimeout }}
120+
- name: WATCH_SERVER_TIMEOUT
121+
value: "{{ .Values.sidecar.rules.watchServerTimeout }}"
122+
{{- end }}
123+
{{- if .Values.sidecar.rules.watchClientTimeout }}
124+
- name: WATCH_CLIENT_TIMEOUT
125+
value: "{{ .Values.sidecar.rules.watchClientTimeout }}"
126+
{{- end }}
127+
{{- if .Values.sidecar.rules.logLevel }}
128+
- name: LOG_LEVEL
129+
value: "{{ .Values.sidecar.rules.logLevel }}"
130+
{{- end }}
131+
{{- if .Values.sidecar.livenessProbe }}
132+
livenessProbe:
133+
{{- toYaml .Values.sidecar.livenessProbe | nindent 12 }}
134+
{{- end }}
135+
{{- if .Values.sidecar.readinessProbe }}
136+
readinessProbe:
137+
{{- toYaml .Values.sidecar.readinessProbe | nindent 12 }}
138+
{{- end }}
139+
{{- if .Values.sidecar.resources }}
140+
resources:
141+
{{- toYaml .Values.sidecar.resources | nindent 12 }}
142+
{{- end }}
143+
{{- if .Values.sidecar.securityContext }}
144+
securityContext:
145+
{{- toYaml .Values.sidecar.securityContext | nindent 12 }}
146+
{{- end }}
147+
volumeMounts:
148+
- name: sc-rules-volume
149+
mountPath: {{ .Values.sidecar.rules.folder | quote }}
150+
{{- end}}
82151
- name: loki
83152
image: {{ include "loki.image" . }}
84153
imagePullPolicy: {{ .Values.loki.image.pullPolicy }}
@@ -125,6 +194,10 @@ spec:
125194
- name: license
126195
mountPath: /etc/loki/license
127196
{{- end }}
197+
{{- if .Values.sidecar.rules.enabled }}
198+
- name: sc-rules-volume
199+
mountPath: {{ .Values.sidecar.rules.folder | quote }}
200+
{{- end}}
128201
{{- with .Values.singleBinary.extraVolumeMounts }}
129202
{{- toYaml . | nindent 12 }}
130203
{{- end }}
@@ -166,6 +239,15 @@ spec:
166239
secretName: enterprise-logs-license
167240
{{- end }}
168241
{{- end }}
242+
{{- if .Values.sidecar.rules.enabled }}
243+
- name: sc-rules-volume
244+
{{- if .Values.sidecar.rules.sizeLimit }}
245+
emptyDir:
246+
sizeLimit: {{ .Values.sidecar.rules.sizeLimit }}
247+
{{- else }}
248+
emptyDir: {}
249+
{{- end -}}
250+
{{- end -}}
169251
{{- with .Values.singleBinary.extraVolumes }}
170252
{{- toYaml . | nindent 8 }}
171253
{{- end }}

0 commit comments

Comments
 (0)