Added support for specifying the image that is used by multipass (#3796)

Co-authored-by: Derek Ruths <[email protected]>
canonical · Mar 21, 2023 · 20ec6d5 · 20ec6d5
1 parent f260f3d
commit 20ec6d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/installer/cli/microk8s.py b/installer/cli/microk8s.py
@@ -89,7 +89,7 @@ def show_help():
   --help  Show this message and exit.
 
 Commands:
-  install         Installs MicroK8s. Use --cpu, --mem, --disk and --channel to configure your setup.
+  install         Installs MicroK8s. Use --cpu, --mem, --disk, --channel, and --image to configure your setup.
   uninstall       Removes MicroK8s"""
     click.echo(msg)
     commands = _get_microk8s_commands()
@@ -112,6 +112,7 @@ def _show_install_help():
       --mem      RAM in GB used by MicroK8s (default={definitions.DEFAULT_MEMORY_GB}, min={definitions.MIN_MEMORY_GB})
       --disk     Max volume in GB of the dynamically expandable hard disk to be used (default={definitions.DEFAULT_DISK_GB}, min={definitions.MIN_DISK_GB})
       --channel  Kubernetes version to install (default={definitions.DEFAULT_CHANNEL})
+      --image    Ubuntu version to install (default={definitions.DEFAULT_IMAGE})
       -y, --assume-yes  Automatic yes to prompts"""  # noqa
     Echo.info(msg)
 
@@ -156,6 +157,7 @@ def install(args) -> None:
     parser.add_argument("--mem", default=definitions.DEFAULT_MEMORY_GB, type=memory)
     parser.add_argument("--disk", default=definitions.DEFAULT_DISK_GB, type=disk)
     parser.add_argument("--channel", default=definitions.DEFAULT_CHANNEL, type=str)
+    parser.add_argument("--image", default=definitions.DEFAULT_IMAGE, type=str)
     parser.add_argument(
         "-y", "--assume-yes", action="store_true", default=definitions.DEFAULT_ASSUME
     )

diff --git a/installer/common/definitions.py b/installer/common/definitions.py
@@ -29,6 +29,7 @@
 DEFAULT_DISK_GB: int = 50
 DEFAULT_ASSUME: bool = False
 DEFAULT_CHANNEL: str = "1.26/stable"
+DEFAULT_IMAGE: str = "18.04"
 
 MIN_CORES: int = 2
 MIN_MEMORY_GB: int = 2

diff --git a/installer/vm_providers/_multipass/_multipass.py b/installer/vm_providers/_multipass/_multipass.py
@@ -56,8 +56,9 @@ def run(self, command: Sequence[str], hide_output: bool = False) -> Optional[byt
         )
 
     def _launch(self, specs: Dict) -> None:
-        image = "18.04"
 
+        # prepare core launch setting
+        image = specs["image"]
         cpus = "{}".format(specs["cpu"])
         mem = "{}G".format(specs["mem"])
         disk = "{}G".format(specs["disk"])