Skip to content

Commit 651d36a

Browse files
committed
vz: graduate from experimental
examples/experimental/vz.yaml is retained until v1.0 RC, to avoid breaking existing bookmarks. Signed-off-by: Akihiro Suda <[email protected]>
1 parent c9e5efd commit 651d36a

File tree

8 files changed

+16
-10
lines changed

8 files changed

+16
-10
lines changed

cmd/limactl/editflags/editflags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func YQExpressions(flags *flag.FlagSet, newInstance bool) ([]string, error) {
194194
return fmt.Sprintf(".rosetta.enabled = %v | .rosetta.binfmt = %v", b, b), nil
195195
},
196196
false,
197-
true,
197+
false,
198198
},
199199
{"set", d("%s"), false, false},
200200
{

examples/default.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ mounts:
9999
writable: true
100100

101101
# Mount type for above mounts, such as "reverse-sshfs" (from sshocker), "9p" (EXPERIMENTAL, from QEMU’s virtio-9p-pci, aka virtfs),
102-
# or "virtiofs" (EXPERIMENTAL, needs `vmType: vz`)
102+
# or "virtiofs" (EXPERIMENTAL, needs `vmType: vz`; will graduate from experimental in Lima v1.0)
103103
# 🟢 Builtin default: "reverse-sshfs" (for QEMU), "virtiofs" (for vz)
104104
mountType: null
105105

@@ -251,7 +251,7 @@ cpuType:
251251
x86_64: null
252252

253253
rosetta:
254-
# Enable Rosetta for Linux (EXPERIMENTAL).
254+
# Enable Rosetta for Linux (EXPERIMENTAL; will graduate from experimental in Lima v1.0).
255255
# Hint: try `softwareupdate --install-rosetta` if Lima gets stuck at `Installing rosetta...`
256256
# 🟢 Builtin default: false
257257
enabled: null
@@ -312,7 +312,7 @@ networks:
312312

313313

314314
# The "vzNAT" IP address is accessible from the host, but not from other guests.
315-
# Needs `vmType: vz` (EXPERIMENTAL).
315+
# Needs `vmType: vz` (EXPERIMENTAL; will graduate from experimental in Lima v1.0).
316316
# - vzNAT: true
317317

318318
# vnl (virtual network locator) points to the vde_switch socket directory,

examples/experimental/vz.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# ⚠️ ⚠️ ⚠️ `template://experimental/vz` will be removed in in Lima v1.0,
2+
# as vz will graduate from experimental and will be the default vmType.
3+
#
4+
# Use the following command instead:
5+
# ```
6+
# limactl create --vm-type=vz --rosetta template://default
7+
# ```
8+
19
# A template to run ubuntu using vmType: vz instead of qemu (Default)
210
# This template requires Lima v0.14.0 or later and macOS 13.
311
vmType: "vz"

pkg/limayaml/validate.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,6 @@ func warnExperimental(y LimaYAML) {
459459
if *y.MountType == VIRTIOFS && runtime.GOOS == "linux" {
460460
logrus.Warn("`mountType: virtiofs` on Linux is experimental")
461461
}
462-
if *y.VMType == VZ {
463-
logrus.Warn("`vmType: vz` is experimental")
464-
}
465462
if *y.Arch == RISCV64 {
466463
logrus.Warn("`arch: riscv64` is experimental")
467464
}

website/content/en/docs/Config/Multi-arch/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ See also https://github.com/containerd/nerdctl/blob/master/docs/multi-platform.m
6363
## [Fast mode 2 (Rosetta): Intel containers on ARM VM on ARM Host](#fast-mode-2)
6464

6565
> **Warning**
66-
> "vz" mode, including support for Rosetta, is experimental
66+
> "vz" mode, including support for Rosetta, is experimental (will graduate from experimental in Lima v1.0)
6767
6868
| ⚡ Requirement | Lima >= 0.14, macOS >= 13.0, ARM |
6969
|-------------------|----------------------------------|

website/content/en/docs/Config/Network/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ networks:
185185
### vzNAT
186186

187187
> **Warning**
188-
> "vz" mode is experimental
188+
> "vz" mode is experimental (will graduate from experimental in Lima v1.0)
189189
190190
| ⚡ Requirement | Lima >= 0.14, macOS >= 13.0 |
191191
|-------------------|-----------------------------|

website/content/en/docs/Config/VMType/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This option is used by default if "vmType" is not set.
2828

2929
## VZ
3030
> **Warning**
31-
> "vz" mode is experimental
31+
> "vz" mode is experimental (will graduate from experimental in Lima v1.0)
3232
3333
| ⚡ Requirement | Lima >= 0.14, macOS >= 13.0 |
3434
|-------------------|-----------------------------|

website/content/en/docs/Releases/Experimental/_index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The following features are experimental and subject to change:
99
- `mountType: 9p`
1010
- `mountType: virtiofs` on Linux
1111
- `vmType: vz` and relevant configurations (`mountType: virtiofs`, `rosetta`, `[]networks.vzNAT`)
12+
(will graduate from experimental in Lima v1.0)
1213
- `vmType: wsl2` and relevant configurations (`mountType: wsl2`)
1314
- `arch: riscv64`
1415
- `video.display: vnc` and relevant configuration (`video.vnc.display`)

0 commit comments

Comments
 (0)