Repository navigation
Commit 5881e65
committed
fix(engine): merge chart Kubernetes documents into the bundle
From contract v1.14 the generated bundle already carries every
Kubernetes document, filled with values only the generator knows:
component images pinned to kubernetesVersion, the control-plane node
label and taint, the kubelet seccomp default, endpoint-derived
documents. A chart document of the same identity replaced the bundle's
copy wholesale, so a chart could only emit these documents by
re-implementing the generator.
Kube* documents and delete selectors from the chart now go through the
config patcher, the same strategic merge the apply path already uses.
The first bundle pass sees the chart's KubeClusterConfig, so the
regenerated bundle derives its endpoint-dependent documents from it. A
full render carries the merged result; a non-full render keeps the
chart's documents verbatim for apply to merge again. Every other kind
keeps replace semantics: the bundle's HostnameConfig carries
`auto: stable`, which Talos refuses next to a chart hostname.
The hint for a v1alpha1/typed-document mix above v1.13 no longer
claims the charts cannot emit the typed documents.
Assisted-by: LLM
Signed-off-by: Aleksei Sviridkin <[email protected]>1 parent cfc5a95 commit 5881e65
2 files changed
Lines changed: 211 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
286 | 286 | | |
287 | 287 | | |
288 | 288 | | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
823 | 824 | | |
824 | 825 | | |
825 | 826 | | |
826 | | - | |
827 | | - | |
| 827 | + | |
| 828 | + | |
828 | 829 | | |
829 | 830 | | |
830 | 831 | | |
| |||
1469 | 1470 | | |
1470 | 1471 | | |
1471 | 1472 | | |
| 1473 | + | |
| 1474 | + | |
| 1475 | + | |
| 1476 | + | |
1472 | 1477 | | |
1473 | 1478 | | |
1474 | 1479 | | |
| |||
1899 | 1904 | | |
1900 | 1905 | | |
1901 | 1906 | | |
| 1907 | + | |
| 1908 | + | |
| 1909 | + | |
| 1910 | + | |
| 1911 | + | |
| 1912 | + | |
| 1913 | + | |
| 1914 | + | |
| 1915 | + | |
| 1916 | + | |
| 1917 | + | |
| 1918 | + | |
| 1919 | + | |
| 1920 | + | |
| 1921 | + | |
| 1922 | + | |
| 1923 | + | |
| 1924 | + | |
| 1925 | + | |
| 1926 | + | |
| 1927 | + | |
| 1928 | + | |
| 1929 | + | |
| 1930 | + | |
| 1931 | + | |
| 1932 | + | |
| 1933 | + | |
| 1934 | + | |
| 1935 | + | |
| 1936 | + | |
| 1937 | + | |
| 1938 | + | |
| 1939 | + | |
1902 | 1940 | | |
1903 | 1941 | | |
1904 | 1942 | | |
| |||
1912 | 1950 | | |
1913 | 1951 | | |
1914 | 1952 | | |
| 1953 | + | |
| 1954 | + | |
| 1955 | + | |
| 1956 | + | |
| 1957 | + | |
1915 | 1958 | | |
1916 | 1959 | | |
1917 | 1960 | | |
| |||
1949 | 1992 | | |
1950 | 1993 | | |
1951 | 1994 | | |
1952 | | - | |
| 1995 | + | |
1953 | 1996 | | |
1954 | 1997 | | |
1955 | 1998 | | |
| |||
2061 | 2104 | | |
2062 | 2105 | | |
2063 | 2106 | | |
2064 | | - | |
| 2107 | + | |
2065 | 2108 | | |
2066 | 2109 | | |
2067 | 2110 | | |
| |||
2070 | 2113 | | |
2071 | 2114 | | |
2072 | 2115 | | |
| 2116 | + | |
| 2117 | + | |
2073 | 2118 | | |
2074 | 2119 | | |
2075 | 2120 | | |
| 2121 | + | |
2076 | 2122 | | |
2077 | 2123 | | |
2078 | 2124 | | |
| |||
2166 | 2212 | | |
2167 | 2213 | | |
2168 | 2214 | | |
2169 | | - | |
2170 | | - | |
| 2215 | + | |
| 2216 | + | |
| 2217 | + | |
| 2218 | + | |
2171 | 2219 | | |
2172 | 2220 | | |
| 2221 | + | |
2173 | 2222 | | |
2174 | 2223 | | |
2175 | 2224 | | |
| |||
0 commit comments