Fix semver image of ubuntu (#229)

Author: majst01

Makefile

@@ -28,7 +28,7 @@ MAX_RETRIES := 30
 
 # Machine flavors
 ifeq ($(MINI_LAB_FLAVOR),cumulus)
-MACHINE_OS=ubuntu-24.04
+MACHINE_OS=ubuntu-24.4
 LAB_MACHINES=machine01,machine02
 LAB_TOPOLOGY=mini-lab.cumulus.yaml
 VRF=vrf20

README.md

@@ -127,7 +127,7 @@ docker compose run --rm metalctl machine create \
         --hostname machine \
         --project 00000000-0000-0000-0000-000000000000 \
         --partition mini-lab \
-        --image ubuntu-24.04 \
+        --image ubuntu-24.4 \
         --size v1-small-x86 \
         --networks <network-ID>
 
@@ -180,7 +180,7 @@ Reinstall a machine with
 
 ```bash
 docker compose run --rm metalctl machine reinstall \
-        --image ubuntu-24.04 \
+        --image ubuntu-24.4 \
         00000000-0000-0000-0000-000000000001
 ```
 

inventories/group_vars/all/images.yaml

@@ -5,10 +5,6 @@ setup_yaml:
   - url: https://raw.githubusercontent.com/metal-stack/releases/{{ metal_stack_release_version }}/release.yaml
     meta_var: metal_stack_release
 
-# TODO: remove these overrides again.
-# see: https://github.com/metal-stack/metal-api/pull/612
-metal_api_image_tag: v0.40.4
-
 ##
 ## for development purposes, you can override releases from our image vector here
 ##

inventories/group_vars/control-plane/metal.yml

@@ -18,7 +18,7 @@ metal_api_images:
   url: https://images.metal-stack.io/metal-os/stable/firewall/3.0-ubuntu/img.tar.lz4
   features:
     - firewall
-- id: ubuntu-24.04
+- id: ubuntu-24.4
   name: Ubuntu 24.04
   description: Ubuntu 24.04 Latest Release
   url: https://images.metal-stack.io/metal-os/stable/ubuntu/24.04/img.tar.lz4

inventories/group_vars/examples/sample_fsl.yaml

@@ -21,7 +21,7 @@ metal_api_filesystemlayouts:
       - c1-xlarge-x86
     images:
       debian: "<= 10.0.{{ fsl.legacy_image_patch_version }}"
-      ubuntu: "<= 20.04.{{ fsl.legacy_image_patch_version }}"
+      ubuntu: "<= 20.4.{{ fsl.legacy_image_patch_version }}"
       centos: "<= 7.0.{{ fsl.legacy_image_patch_version }}"
   filesystems:
     - path: "/boot/efi"
@@ -70,7 +70,7 @@ metal_api_filesystemlayouts:
       - s1-large-x86
     images:
         debian: ">= 10.0.{{ fsl.new_image_patch_version }}"
-        ubuntu: ">= 20.04.{{ fsl.new_image_patch_version }}"
+        ubuntu: ">= 20.4.{{ fsl.new_image_patch_version }}"
         centos: ">= 7.0.{{ fsl.new_image_patch_version }}"
   filesystems:
     - path: "/boot/efi"
@@ -130,7 +130,7 @@ metal_api_filesystemlayouts:
       - s2-xlarge-x86
     images:
       debian: "<= 10.0.{{ fsl.legacy_image_patch_version }}"
-      ubuntu: "<= 20.04.{{ fsl.legacy_image_patch_version }}"
+      ubuntu: "<= 20.4.{{ fsl.legacy_image_patch_version }}"
   filesystems:
     - path: "/boot/efi"
       device: "/dev/sde1"