Commit 3498576
authored
feature: add kafka raw env option (#14892)
#### What this PR does
Add kafka raw env option.
```
kafka:
env:
- xxxx
```
#### Which issue(s) this PR fixes or relates to
Fixes #14891
#### Checklist
- [ ] Tests updated.
- [ ] Documentation added.
- [x] `CHANGELOG.md` updated - the order of entries should be
`[CHANGE]`, `[FEATURE]`, `[ENHANCEMENT]`, `[BUGFIX]`. If changelog entry
is not needed, please add the `changelog-not-needed` label to the PR.
- [ ]
[`about-versioning.md`](https://github.com/grafana/mimir/blob/main/docs/sources/mimir/configure/about-versioning.md)
updated with experimental features.
<!-- CURSOR_SUMMARY -->
---
> [!NOTE]
> **Medium Risk**
> Changes how environment variables are merged/rendered for containers,
which can alter pod specs and runtime behavior if users relied on
previous env ordering or override behavior.
>
> **Overview**
> Updates the `mimir-distributed` Helm chart to replace Kafka’s
`extraEnv` with a new `kafka.env` list that **merges by variable name**
into the chart’s default Kafka env vars, allowing selective overrides
without dropping the remaining defaults.
>
> Refactors Kafka’s StatefulSet to build its default env list
in-template and render env/envFrom via `mimir.lib.containerEnv`, and
updates `containerEnv.tpl` so user-provided env entries override
defaults *in-place* (preserving default ordering) while still appending
truly new variables. Changelog and generated golden manifests are
updated accordingly.
>
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
dc48409. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
---------
Signed-off-by: Rodrigo Kellermann <kellermann@gmail.com>1 parent d967c45 commit 3498576
28 files changed
Lines changed: 202 additions & 270 deletions
File tree
- operations/helm
- charts/mimir-distributed
- templates
- kafka
- lib
- tests
- gateway-nginx-values-generated/mimir-distributed/templates/kafka
- keda-autoscaling-global-values-generated/mimir-distributed/templates/kafka
- keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/kafka
- keda-autoscaling-values-generated/mimir-distributed/templates/kafka
- large-values-generated/mimir-distributed/templates/kafka
- metamonitoring-values-generated/mimir-distributed/templates/kafka
- openshift-values-generated/mimir-distributed/templates/kafka
- scheduler-name-values-generated/mimir-distributed/templates/kafka
- small-values-generated/mimir-distributed/templates/kafka
- test-extra-args-values-generated/mimir-distributed/templates/kafka
- test-extra-objects-values-generated/mimir-distributed/templates/kafka
- test-gomaxprocs-override-values-generated/mimir-distributed/templates/kafka
- test-ingest-storage-values-generated/mimir-distributed/templates/kafka
- test-ingress-values-generated/mimir-distributed/templates/kafka
- test-oss-component-image-values-generated/mimir-distributed/templates/kafka
- test-oss-emptydir-values-generated/mimir-distributed/templates/kafka
- test-oss-logical-multizone-values-generated/mimir-distributed/templates/kafka
- test-oss-multizone-values-generated/mimir-distributed/templates/kafka
- test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/kafka
- test-oss-values-generated/mimir-distributed/templates/kafka
- test-requests-and-limits-values-generated/mimir-distributed/templates/kafka
- test-revisionhistorylimit-values-generated/mimir-distributed/templates/kafka
- test-ruler-dedicated-query-path-values-generated/mimir-distributed/templates/kafka
- test-vault-agent-values-generated/mimir-distributed/templates/kafka
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
| 33 | + | |
| 34 | + | |
32 | 35 | | |
33 | 36 | | |
34 | 37 | | |
| |||
Lines changed: 24 additions & 43 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
111 | 92 | | |
112 | 93 | | |
113 | 94 | | |
| |||
Lines changed: 24 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
| 8 | + | |
7 | 9 | | |
8 | 10 | | |
9 | 11 | | |
| |||
12 | 14 | | |
13 | 15 | | |
14 | 16 | | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
19 | 20 | | |
20 | | - | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | | - | |
| 24 | + | |
24 | 25 | | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
25 | 29 | | |
26 | | - | |
27 | | - | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
28 | 43 | | |
29 | 44 | | |
30 | 45 | | |
| |||
34 | 49 | | |
35 | 50 | | |
36 | 51 | | |
37 | | - | |
| 52 | + | |
38 | 53 | | |
39 | 54 | | |
40 | 55 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3121 | 3121 | | |
3122 | 3122 | | |
3123 | 3123 | | |
3124 | | - | |
3125 | | - | |
| 3124 | + | |
| 3125 | + | |
| 3126 | + | |
| 3127 | + | |
3126 | 3128 | | |
3127 | 3129 | | |
3128 | 3130 | | |
| |||
Lines changed: 6 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
56 | 55 | | |
57 | 56 | | |
58 | 57 | | |
| |||
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
67 | | - | |
| 66 | + | |
68 | 67 | | |
69 | | - | |
| 68 | + | |
70 | 69 | | |
71 | 70 | | |
72 | 71 | | |
73 | | - | |
74 | | - | |
| 72 | + | |
75 | 73 | | |
76 | | - | |
| 74 | + | |
77 | 75 | | |
78 | | - | |
| 76 | + | |
79 | 77 | | |
80 | | - | |
81 | | - | |
| 78 | + | |
82 | 79 | | |
83 | 80 | | |
84 | 81 | | |
| |||
Lines changed: 6 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
56 | 55 | | |
57 | 56 | | |
58 | 57 | | |
| |||
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
67 | | - | |
| 66 | + | |
68 | 67 | | |
69 | | - | |
| 68 | + | |
70 | 69 | | |
71 | 70 | | |
72 | 71 | | |
73 | | - | |
74 | | - | |
| 72 | + | |
75 | 73 | | |
76 | | - | |
| 74 | + | |
77 | 75 | | |
78 | | - | |
| 76 | + | |
79 | 77 | | |
80 | | - | |
81 | | - | |
| 78 | + | |
82 | 79 | | |
83 | 80 | | |
84 | 81 | | |
| |||
Lines changed: 6 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
56 | 55 | | |
57 | 56 | | |
58 | 57 | | |
| |||
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
67 | | - | |
| 66 | + | |
68 | 67 | | |
69 | | - | |
| 68 | + | |
70 | 69 | | |
71 | 70 | | |
72 | 71 | | |
73 | | - | |
74 | | - | |
| 72 | + | |
75 | 73 | | |
76 | | - | |
| 74 | + | |
77 | 75 | | |
78 | | - | |
| 76 | + | |
79 | 77 | | |
80 | | - | |
81 | | - | |
| 78 | + | |
82 | 79 | | |
83 | 80 | | |
84 | 81 | | |
| |||
Lines changed: 6 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
56 | 55 | | |
57 | 56 | | |
58 | 57 | | |
| |||
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
67 | | - | |
| 66 | + | |
68 | 67 | | |
69 | | - | |
| 68 | + | |
70 | 69 | | |
71 | 70 | | |
72 | 71 | | |
73 | | - | |
74 | | - | |
| 72 | + | |
75 | 73 | | |
76 | | - | |
| 74 | + | |
77 | 75 | | |
78 | | - | |
| 76 | + | |
79 | 77 | | |
80 | | - | |
81 | | - | |
| 78 | + | |
82 | 79 | | |
83 | 80 | | |
84 | 81 | | |
| |||
Lines changed: 6 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
56 | 55 | | |
57 | 56 | | |
58 | 57 | | |
| |||
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
67 | | - | |
| 66 | + | |
68 | 67 | | |
69 | | - | |
| 68 | + | |
70 | 69 | | |
71 | 70 | | |
72 | 71 | | |
73 | | - | |
74 | | - | |
| 72 | + | |
75 | 73 | | |
76 | | - | |
| 74 | + | |
77 | 75 | | |
78 | | - | |
| 76 | + | |
79 | 77 | | |
80 | | - | |
81 | | - | |
| 78 | + | |
82 | 79 | | |
83 | 80 | | |
84 | 81 | | |
| |||
0 commit comments