Skip to content

Commit db72164

Browse files
bentonambentonam
authored
feat: added support for overrides exporter (#15630)
1 parent 732cc8b commit db72164

File tree

8 files changed

+648
-0
lines changed

8 files changed

+648
-0
lines changed

‎docs/sources/setup/install/helm/reference.md‎

Lines changed: 299 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7660,6 +7660,305 @@ false
76607660
<td><pre lang="json">
76617661
{}
76627662
</pre>
7663+
</td>
7664+
</tr>
7665+
<tr>
7666+
<td>overridesExporter</td>
7667+
<td>object</td>
7668+
<td>Configuration for the overrides-exporter</td>
7669+
<td><pre lang="json">
7670+
{
7671+
"affinity": {
7672+
"podAntiAffinity": {
7673+
"requiredDuringSchedulingIgnoredDuringExecution": [
7674+
{
7675+
"labelSelector": {
7676+
"matchLabels": {
7677+
"app.kubernetes.io/component": "overrides-exporter"
7678+
}
7679+
},
7680+
"topologyKey": "kubernetes.io/hostname"
7681+
}
7682+
]
7683+
}
7684+
},
7685+
"appProtocol": {
7686+
"grpc": ""
7687+
},
7688+
"command": null,
7689+
"enabled": false,
7690+
"extraArgs": [],
7691+
"extraContainers": [],
7692+
"extraEnv": [],
7693+
"extraEnvFrom": [],
7694+
"extraVolumeMounts": [],
7695+
"extraVolumes": [],
7696+
"hostAliases": [],
7697+
"image": {
7698+
"registry": null,
7699+
"repository": null,
7700+
"tag": null
7701+
},
7702+
"initContainers": [],
7703+
"maxUnavailable": null,
7704+
"nodeSelector": {},
7705+
"podAnnotations": {},
7706+
"podLabels": {},
7707+
"priorityClassName": null,
7708+
"replicas": 0,
7709+
"resources": {},
7710+
"serviceAnnotations": {},
7711+
"serviceLabels": {},
7712+
"terminationGracePeriodSeconds": 300,
7713+
"tolerations": [],
7714+
"topologySpreadConstraints": []
7715+
}
7716+
</pre>
7717+
</td>
7718+
</tr>
7719+
<tr>
7720+
<td>overridesExporter.affinity</td>
7721+
<td>object</td>
7722+
<td>Affinity for overrides-exporter pods.</td>
7723+
<td><pre lang="">
7724+
Hard node anti-affinity
7725+
</pre>
7726+
</td>
7727+
</tr>
7728+
<tr>
7729+
<td>overridesExporter.appProtocol</td>
7730+
<td>object</td>
7731+
<td>Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"</td>
7732+
<td><pre lang="json">
7733+
{
7734+
"grpc": ""
7735+
}
7736+
</pre>
7737+
</td>
7738+
</tr>
7739+
<tr>
7740+
<td>overridesExporter.command</td>
7741+
<td>string</td>
7742+
<td>Command to execute instead of defined in Docker image</td>
7743+
<td><pre lang="json">
7744+
null
7745+
</pre>
7746+
</td>
7747+
</tr>
7748+
<tr>
7749+
<td>overridesExporter.enabled</td>
7750+
<td>bool</td>
7751+
<td>The overrides-exporter component is optional and can be disabled if desired.</td>
7752+
<td><pre lang="json">
7753+
false
7754+
</pre>
7755+
</td>
7756+
</tr>
7757+
<tr>
7758+
<td>overridesExporter.extraArgs</td>
7759+
<td>list</td>
7760+
<td>Additional CLI args for the overrides-exporter</td>
7761+
<td><pre lang="json">
7762+
[]
7763+
</pre>
7764+
</td>
7765+
</tr>
7766+
<tr>
7767+
<td>overridesExporter.extraContainers</td>
7768+
<td>list</td>
7769+
<td>Containers to add to the overrides-exporter pods</td>
7770+
<td><pre lang="json">
7771+
[]
7772+
</pre>
7773+
</td>
7774+
</tr>
7775+
<tr>
7776+
<td>overridesExporter.extraEnv</td>
7777+
<td>list</td>
7778+
<td>Environment variables to add to the overrides-exporter pods</td>
7779+
<td><pre lang="json">
7780+
[]
7781+
</pre>
7782+
</td>
7783+
</tr>
7784+
<tr>
7785+
<td>overridesExporter.extraEnvFrom</td>
7786+
<td>list</td>
7787+
<td>Environment variables from secrets or configmaps to add to the overrides-exporter pods</td>
7788+
<td><pre lang="json">
7789+
[]
7790+
</pre>
7791+
</td>
7792+
</tr>
7793+
<tr>
7794+
<td>overridesExporter.extraVolumeMounts</td>
7795+
<td>list</td>
7796+
<td>Volume mounts to add to the overrides-exporter pods</td>
7797+
<td><pre lang="json">
7798+
[]
7799+
</pre>
7800+
</td>
7801+
</tr>
7802+
<tr>
7803+
<td>overridesExporter.extraVolumes</td>
7804+
<td>list</td>
7805+
<td>Volumes to add to the overrides-exporter pods</td>
7806+
<td><pre lang="json">
7807+
[]
7808+
</pre>
7809+
</td>
7810+
</tr>
7811+
<tr>
7812+
<td>overridesExporter.hostAliases</td>
7813+
<td>list</td>
7814+
<td>hostAliases to add</td>
7815+
<td><pre lang="json">
7816+
[]
7817+
</pre>
7818+
</td>
7819+
</tr>
7820+
<tr>
7821+
<td>overridesExporter.image.registry</td>
7822+
<td>string</td>
7823+
<td>The Docker registry for the overrides-exporter image. Overrides `loki.image.registry`</td>
7824+
<td><pre lang="json">
7825+
null
7826+
</pre>
7827+
</td>
7828+
</tr>
7829+
<tr>
7830+
<td>overridesExporter.image.repository</td>
7831+
<td>string</td>
7832+
<td>Docker image repository for the overrides-exporter image. Overrides `loki.image.repository`</td>
7833+
<td><pre lang="json">
7834+
null
7835+
</pre>
7836+
</td>
7837+
</tr>
7838+
<tr>
7839+
<td>overridesExporter.image.tag</td>
7840+
<td>string</td>
7841+
<td>Docker image tag for the overrides-exporter image. Overrides `loki.image.tag`</td>
7842+
<td><pre lang="json">
7843+
null
7844+
</pre>
7845+
</td>
7846+
</tr>
7847+
<tr>
7848+
<td>overridesExporter.initContainers</td>
7849+
<td>list</td>
7850+
<td>Init containers to add to the overrides-exporter pods</td>
7851+
<td><pre lang="json">
7852+
[]
7853+
</pre>
7854+
</td>
7855+
</tr>
7856+
<tr>
7857+
<td>overridesExporter.maxUnavailable</td>
7858+
<td>string</td>
7859+
<td>Pod Disruption Budget maxUnavailable</td>
7860+
<td><pre lang="json">
7861+
null
7862+
</pre>
7863+
</td>
7864+
</tr>
7865+
<tr>
7866+
<td>overridesExporter.nodeSelector</td>
7867+
<td>object</td>
7868+
<td>Node selector for overrides-exporter pods</td>
7869+
<td><pre lang="json">
7870+
{}
7871+
</pre>
7872+
</td>
7873+
</tr>
7874+
<tr>
7875+
<td>overridesExporter.podAnnotations</td>
7876+
<td>object</td>
7877+
<td>Annotations for overrides-exporter pods</td>
7878+
<td><pre lang="json">
7879+
{}
7880+
</pre>
7881+
</td>
7882+
</tr>
7883+
<tr>
7884+
<td>overridesExporter.podLabels</td>
7885+
<td>object</td>
7886+
<td>Labels for overrides-exporter pods</td>
7887+
<td><pre lang="json">
7888+
{}
7889+
</pre>
7890+
</td>
7891+
</tr>
7892+
<tr>
7893+
<td>overridesExporter.priorityClassName</td>
7894+
<td>string</td>
7895+
<td>The name of the PriorityClass for overrides-exporter pods</td>
7896+
<td><pre lang="json">
7897+
null
7898+
</pre>
7899+
</td>
7900+
</tr>
7901+
<tr>
7902+
<td>overridesExporter.replicas</td>
7903+
<td>int</td>
7904+
<td>Number of replicas for the overrides-exporter</td>
7905+
<td><pre lang="json">
7906+
0
7907+
</pre>
7908+
</td>
7909+
</tr>
7910+
<tr>
7911+
<td>overridesExporter.resources</td>
7912+
<td>object</td>
7913+
<td>Resource requests and limits for the overrides-exporter</td>
7914+
<td><pre lang="json">
7915+
{}
7916+
</pre>
7917+
</td>
7918+
</tr>
7919+
<tr>
7920+
<td>overridesExporter.serviceAnnotations</td>
7921+
<td>object</td>
7922+
<td>Annotations for overrides-exporter service</td>
7923+
<td><pre lang="json">
7924+
{}
7925+
</pre>
7926+
</td>
7927+
</tr>
7928+
<tr>
7929+
<td>overridesExporter.serviceLabels</td>
7930+
<td>object</td>
7931+
<td>Labels for overrides-exporter service</td>
7932+
<td><pre lang="json">
7933+
{}
7934+
</pre>
7935+
</td>
7936+
</tr>
7937+
<tr>
7938+
<td>overridesExporter.terminationGracePeriodSeconds</td>
7939+
<td>int</td>
7940+
<td>Grace period to allow the overrides-exporter to shutdown before it is killed</td>
7941+
<td><pre lang="json">
7942+
300
7943+
</pre>
7944+
</td>
7945+
</tr>
7946+
<tr>
7947+
<td>overridesExporter.tolerations</td>
7948+
<td>list</td>
7949+
<td>Tolerations for overrides-exporter pods</td>
7950+
<td><pre lang="json">
7951+
[]
7952+
</pre>
7953+
</td>
7954+
</tr>
7955+
<tr>
7956+
<td>overridesExporter.topologySpreadConstraints</td>
7957+
<td>list</td>
7958+
<td>Topology Spread Constraints for overrides-exporter pods</td>
7959+
<td><pre lang="json">
7960+
[]
7961+
</pre>
76637962
</td>
76647963
</tr>
76657964
<tr>

‎production/helm/loki/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang
1313

1414
[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
1515

16+
## 6.25.0
17+
18+
- [FEATURE] Added support for Overrides Exporter
19+
1620
## 6.24.0
1721

1822
- [BUGFIX] Add conditional to include ruler config only if `ruler.enabled=true`

‎production/helm/loki/templates/overrides-exporter/_helpers-overrides-exporter.tpl‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{{/*
2+
overrides-exporter fullname
3+
*/}}
4+
{{- define "loki.overridesExporterFullname" -}}
5+
{{ include "loki.fullname" . }}-overrides-exporter
6+
{{- end }}
7+
8+
{{/*
9+
overrides-exporter common labels
10+
*/}}
11+
{{- define "loki.overridesExporterLabels" -}}
12+
{{ include "loki.labels" . }}
13+
app.kubernetes.io/component: overrides-exporter
14+
{{- end }}
15+
16+
{{/*
17+
overrides-exporter selector labels
18+
*/}}
19+
{{- define "loki.overridesExporterSelectorLabels" -}}
20+
{{ include "loki.selectorLabels" . }}
21+
app.kubernetes.io/component: overrides-exporter
22+
{{- end }}
23+
24+
{{/*
25+
overrides-exporter priority class name
26+
*/}}
27+
{{- define "loki.overridesExporterPriorityClassName" -}}
28+
{{- $pcn := coalesce .Values.global.priorityClassName .Values.overridesExporter.priorityClassName -}}
29+
{{- if $pcn }}
30+
priorityClassName: {{ $pcn }}
31+
{{- end }}
32+
{{- end }}

0 commit comments

Comments
 (0)