Merge pull request #2814 from AkihiroSuda/fix-templates-version

templates: fix minimumLimaVersion for riscv64-enabled templates ;  default: move several properties to the (further) advanced section

Author: jandubois

templates/default.yaml

@@ -5,28 +5,12 @@
 # Default values in this YAML file are specified by `null` instead of Lima's "builtin default" values,
 # so they can be overridden by the $LIMA_HOME/_config/default.yaml mechanism documented at the end of this file.
 
-# A template should specify the minimum Lima version required to parse this template correctly.
-# It should not be set if the minimum version is less than 1.0.0
-# 🟢 Builtin default: not set
-minimumLimaVersion: null
-
 # VM type: "qemu", "vz" (on macOS 13 and later), or "default".
 # The vmType can be specified only on creating the instance.
 # The vmType of existing instances cannot be changed.
 # 🟢 Builtin default: "vz" (on macOS 13.5 and later), "qemu" (on others)
 vmType: null
 
-vmOpts:
-  qemu:
-    # Minimum version of QEMU required to create an instance of this template.
-    # Will be ignored if the vmType is not "qemu"
-    # 🟢 Builtin default: not set
-    minimumVersion: null
-
-# OS: "Linux".
-# 🟢 Builtin default: "Linux"
-os: null
-
 # Arch: "default", "x86_64", "aarch64".
 # 🟢 Builtin default: "default" (corresponds to the host architecture)
 arch: null
@@ -135,6 +119,10 @@ mountType: null
 # 🟢 Builtin default: Disabled by default
 mountInotify: null
 
+# ===================================================================== #
+# ADVANCED CONFIGURATION
+# ===================================================================== #
+
 # Lima disks to attach to the instance. The disks will be accessible from inside the
 # instance, labeled by name. (e.g. if the disk is named "data", it will be labeled
 # "lima-data" inside the instance). The disk will be mounted inside the instance at
@@ -173,10 +161,6 @@ ssh:
   # 🟢 Builtin default: false
   forwardX11Trusted: null
 
-# ===================================================================== #
-# ADVANCED CONFIGURATION
-# ===================================================================== #
-
 caCerts:
   # If set to `true`, this will remove all the default trusted CA certificates that
   # are normally shipped with the OS.
@@ -285,6 +269,22 @@ containerd:
 # FURTHER ADVANCED CONFIGURATION
 # ===================================================================== #
 
+# A template should specify the minimum Lima version required to parse this template correctly.
+# It should not be set if the minimum version is less than 1.0.0
+# 🟢 Builtin default: not set
+minimumLimaVersion: null
+
+vmOpts:
+  qemu:
+    # Minimum version of QEMU required to create an instance of this template.
+    # Will be ignored if the vmType is not "qemu"
+    # 🟢 Builtin default: not set
+    minimumVersion: null
+
+# OS: "Linux".
+# 🟢 Builtin default: "Linux"
+os: null
+
 # Specify desired QEMU CPU type for each arch.
 # You can see what options are available for host emulation with: `qemu-system-$(arch) -cpu help`.
 # Setting of instructions is supported like this: "qemu64,+ssse3".

templates/ubuntu-22.04.yaml

@@ -1,4 +1,4 @@
-# This template requires Lima v0.7.0 or later.
+minimumLimaVersion: "1.0.0"
 images:
 # Try to use release-yyyyMMdd image if available. Note that release-yyyyMMdd will be removed after several months.
 - location: "https://cloud-images.ubuntu.com/releases/22.04/release-20241002/ubuntu-22.04-server-cloudimg-amd64.img"

templates/ubuntu-24.04.yaml

@@ -1,4 +1,4 @@
-# This template requires Lima v0.7.0 or later.
+minimumLimaVersion: "1.0.0"
 images:
 # Try to use release-yyyyMMdd image if available. Note that release-yyyyMMdd will be removed after several months.
 - location: "https://cloud-images.ubuntu.com/releases/24.04/release-20240821/ubuntu-24.04-server-cloudimg-amd64.img"

templates/ubuntu-24.10.yaml

@@ -1,4 +1,4 @@
-# This template requires Lima v0.7.0 or later.
+minimumLimaVersion: "1.0.0"
 images:
 # Try to use release-yyyyMMdd image if available. Note that release-yyyyMMdd will be removed after several months.
 - location: "https://cloud-images.ubuntu.com/releases/24.10/release-20241009/ubuntu-24.10-server-cloudimg-amd64.img"