Skip to content

Commit 83846f2

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 74e2fda commit 83846f2

File tree

8 files changed

+16
-10
lines changed

8 files changed

+16
-10
lines changed

cmd/limactl/editflags/editflags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func YQExpressions(flags *flag.FlagSet, newInstance bool) ([]string, error) {
196196
return fmt.Sprintf(".rosetta.enabled = %v | .rosetta.binfmt = %v", b, b), nil
197197
},
198198
false,
199-
true,
199+
false,
200200
},
201201
{"set", d("%s"), false, false},
202202
{

examples/default.yaml

+3-3
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

@@ -267,7 +267,7 @@ cpuType:
267267
# x86_64: "qemu64" # (or "host,-pdpe1gb" when running on x86_64 host)
268268

269269
rosetta:
270-
# Enable Rosetta for Linux (EXPERIMENTAL).
270+
# Enable Rosetta for Linux (EXPERIMENTAL; will graduate from experimental in Lima v1.0).
271271
# Hint: try `softwareupdate --install-rosetta` if Lima gets stuck at `Installing rosetta...`
272272
# 🟢 Builtin default: false
273273
enabled: null
@@ -343,7 +343,7 @@ networks:
343343

344344

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

349349
# Port forwarding rules. Forwarding between ports 22 and ssh.localPort cannot be overridden.

examples/experimental/vz.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# ⚠️ ⚠️ ⚠️ `template://experimental/vz` will be removed in Lima v1.0,
2+
# as vz will graduate from experimental and will be the default vmType.
3+
#
4+
# For Lima v1.0 and later, use the following command instead:
5+
# ```
6+
# limactl create 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

-3
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,6 @@ func warnExperimental(y *LimaYAML) {
447447
if *y.MountType == VIRTIOFS && runtime.GOOS == "linux" {
448448
logrus.Warn("`mountType: virtiofs` on Linux is experimental")
449449
}
450-
if *y.VMType == VZ {
451-
logrus.Warn("`vmType: vz` is experimental")
452-
}
453450
if *y.Arch == RISCV64 {
454451
logrus.Warn("`arch: riscv64` is experimental")
455452
}

website/content/en/docs/config/multi-arch/_index.md

+1-1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ networks:
180180
### vzNAT
181181

182182
> **Warning**
183-
> "vz" mode is experimental
183+
> "vz" mode is experimental (will graduate from experimental in Lima v1.0)
184184
185185
| ⚡ Requirement | Lima >= 0.14, macOS >= 13.0 |
186186
|-------------------|-----------------------------|

website/content/en/docs/config/vmtype/_index.md

+1-1
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

+1
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)