Commit d4b5ff9
Conner Aldrich
fix: restore upstream blocks accidentally removed in earlier commits
Three blocks were dropped accidentally by overly-greedy StrReplace edits
in earlier commits. Restore them to match upstream main:
1. apps/supervisor/src/env.ts: KUBERNETES_POD_DNS_NDOTS_OVERRIDE_ENABLED
and KUBERNETES_POD_DNS_NDOTS env vars (and their multi-line comment
explaining the ndots-tuning rationale) — dropped in 171b09f
(feat(supervisor): parameterize worker-pod and -container
securityContext) when the surrounding KUBERNETES_WORKER_*
parameterization was added.
2. apps/supervisor/src/workloadManager/kubernetes.ts: corresponding
dnsConfig block in the worker pod spec that consumes the env vars —
dropped in the same commit.
3. hosting/k8s/helm/values.yaml: webapp.serviceAccount block (create,
name, annotations) — dropped in 7c5f3a5 (fix(helm): default worker
Role to empty rules) when the worker.rbac block was edited; the
StrReplace replacement string accidentally swallowed the unrelated
webapp.serviceAccount block above it.
No functional change to our patches; pure restoration of upstream code.1 parent a2d7484 commit d4b5ff9
3 files changed
Lines changed: 29 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
148 | 158 | | |
149 | 159 | | |
150 | 160 | | |
| |||
213 | 223 | | |
214 | 224 | | |
215 | 225 | | |
216 | | - | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
217 | 229 | | |
218 | 230 | | |
219 | 231 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
335 | 335 | | |
336 | 336 | | |
337 | 337 | | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
338 | 345 | | |
339 | 346 | | |
340 | 347 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
208 | 208 | | |
209 | 209 | | |
210 | 210 | | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
211 | 220 | | |
212 | 221 | | |
213 | 222 | | |
| |||
0 commit comments