From ce99483227ee55cfe0b601d74ef95ebd81057e65 Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Tue, 2 Jul 2024 12:51:12 +0200 Subject: [PATCH] Update machine image and dependencies (#172) --- Makefile | 2 +- README.md | 6 +++--- inventories/group_vars/control-plane/metal.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d01dd5d6..ef8b0dee 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ MINI_LAB_FLAVOR := $(or $(MINI_LAB_FLAVOR),sonic) MINI_LAB_VM_IMAGE := $(or $(MINI_LAB_VM_IMAGE),ghcr.io/metal-stack/mini-lab-vms:latest) MINI_LAB_SONIC_IMAGE := $(or $(MINI_LAB_SONIC_IMAGE),ghcr.io/metal-stack/mini-lab-sonic:latest) -MACHINE_OS=ubuntu-22.04 +MACHINE_OS=ubuntu-24.04 # Machine flavors ifeq ($(MINI_LAB_FLAVOR),cumulus) diff --git a/README.md b/README.md index 94798a6c..cb0a08c1 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ The mini-lab is a small, virtual setup to locally run the metal-stack. It deploy - Linux machine with hardware virtualization support - kvm as hypervisor for the VMs (you can check through the `kvm-ok` command) -- [docker](https://www.docker.com/) >= 20.10.13 (for using kind and our deployment base image) -- [kind](https://github.com/kubernetes-sigs/kind/releases) == v0.20.0 (for hosting the metal control plane) -- [containerlab](https://containerlab.srlinux.dev/install/) >= v0.47.1 +- [docker](https://www.docker.com/) >= 24.x.y (for using kind and our deployment base image) +- [kind](https://github.com/kubernetes-sigs/kind/releases) == v0.23.0 (for hosting the metal control plane) +- [containerlab](https://containerlab.dev/install/) >= v0.55.0 - the lab creates a docker network on your host machine (`172.17.0.1`), this hopefully does not overlap with other networks you have - (recommended) haveged to have enough random entropy (only needed if the PXE process does not work) diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml index 86823e19..6cf4cb36 100644 --- a/inventories/group_vars/control-plane/metal.yml +++ b/inventories/group_vars/control-plane/metal.yml @@ -20,10 +20,10 @@ metal_api_images: url: https://images.metal-stack.io/metal-os/{{ metal_api_latest_os_image_release_name }}/firewall/3.0-ubuntu/img.tar.lz4 features: - firewall -- id: ubuntu-22.04 - name: Ubuntu 22.04 - description: Ubuntu 22.04 Latest Release - url: https://images.metal-stack.io/metal-os/{{ metal_api_latest_os_image_release_name }}/ubuntu/22.04/img.tar.lz4 +- id: ubuntu-24.04 + name: Ubuntu 24.04 + description: Ubuntu 24.04 Latest Release + url: https://images.metal-stack.io/metal-os/{{ metal_api_latest_os_image_release_name }}/ubuntu/24.04/img.tar.lz4 features: - machine