Commit d6f4f64
committed
limayaml: do not default containerd.user=true on non-Linux guests
FillDefault enabled containerd.user=true whenever the guest arch was
x86_64 or aarch64, with no check on the guest OS. macOS (os: Darwin)
and FreeBSD guests therefore defaulted to containerd.user=true even
though nerdctl is a Linux-only runtime, causing the ~250 MiB nerdctl
archive to be downloaded unnecessarily.
Gate the true default on *y.OS == limatype.LINUX. Behavior for Linux
guests is unchanged; non-Linux guests now default to
containerd.user=false on every architecture. Explicit
containerd.user=true in user YAML is preserved.
Add TestContainerdUserDefaultPerOS covering the Linux/Darwin/FreeBSD
matrix and TestContainerdUserExplicitOverride to lock the override
path.
Fixes #5037
Signed-off-by: gaurav0107 <gauravdubey0107@gmail.com>1 parent 3569ecb commit d6f4f64
2 files changed
Lines changed: 62 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
528 | 528 | | |
529 | 529 | | |
530 | 530 | | |
531 | | - | |
532 | | - | |
533 | | - | |
534 | | - | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
535 | 542 | | |
536 | 543 | | |
537 | 544 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
887 | 887 | | |
888 | 888 | | |
889 | 889 | | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
| 894 | + | |
| 895 | + | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
| 899 | + | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
0 commit comments