From 353ceb948e66a8288acd259f25b315d4a003cc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano@fidencio.org>
Date: Mon, 27 Jan 2025 12:31:03 +0100
Subject: [PATCH] versions: Don't use the yaml variable definitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While having variables are nice, those are more extensive to write down,
and actually confusing for tired developer eyes to read, plus we're
mixing the use of the yaml variables here and there together with not
using them for some architectures.

With the best "all or nothing" spirit, let's just make it easier for our
developers to read the versions.yaml and easily understand what's being
used.

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
---
 versions.yaml | 63 ++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/versions.yaml b/versions.yaml
index f3f65f341d..cd952ae993 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -116,42 +116,39 @@ assets:
     url: "https://github.com/kata-containers/kata-containers/tools/osbuilder"
     architecture:
       aarch64:
-        name: &default-image-name "ubuntu"
-        version: &default-image-version "latest"
+        name: "ubuntu"
+        version: "latest"
         nvidia-gpu:
-          name: *default-image-name
+          name: "ubuntu"
           version: "jammy"
         nvidia-gpu-confidential:
-          name: *default-image-name
+          name: "ubuntu"
           version: "jammy"
       ppc64le:
-        name: *default-image-name
-        version: *default-image-version
+        name: "ubuntu"
+        version: "latest"
       s390x:
-        name: *default-image-name
-        version: *default-image-version
+        name: "ubuntu"
+        version: "latest"
         confidential:
-          name: *default-image-name
-          version: *default-image-version
+          name: "ubuntu"
+          version: "latest"
       x86_64:
-        name: *default-image-name
-        version: *default-image-version
+        name: "ubuntu"
+        version: "latest"
         confidential:
-          name: *default-image-name
-          version: *default-image-version
+          name: "ubuntu"
+          version: "latest"
         mariner:
           name: "cbl-mariner"
           version: "3.0"
         nvidia-gpu:
-          name: *default-image-name
+          name: "ubuntu"
           version: "jammy"
         nvidia-gpu-confidential:
-          name: *default-image-name
+          name: "ubuntu"
           version: "jammy"
 
-    meta:
-      image-type: *default-image-name
-
   initrd:
     description: |
       Root filesystem initrd used to boot the guest virtual
@@ -159,8 +156,8 @@ assets:
     url: "https://github.com/kata-containers/kata-containers/tools/osbuilder"
     architecture:
       aarch64:
-        name: &default-initrd-name "alpine"
-        version: &default-initrd-version "3.18"
+        name: "alpine"
+        version: "3.18"
         nvidia-gpu:
           name: "ubuntu"
           version: "jammy"
@@ -170,25 +167,25 @@ assets:
       # Do not use Alpine on ppc64le & s390x, the agent cannot use musl because
       # there is no such Rust target
       ppc64le:
-        name: &glibc-initrd-name "ubuntu"
-        version: &glibc-initrd-version "20.04"
+        name: "ubuntu"
+        version: "20.04"
       s390x:
-        name: *glibc-initrd-name
-        version: *glibc-initrd-version
+        name: "ubuntu"
+        version: "20.04"
         confidential:
-          name: *glibc-initrd-name
-          version: *glibc-initrd-version
+          name: "ubuntu"
+          version: "20.04"
       x86_64:
-        name: *default-initrd-name
-        version: *default-initrd-version
+        name: "alpine"
+        version: "3.18"
         confidential:
-          name: *glibc-initrd-name
-          version: *glibc-initrd-version
+          name: "ubuntu"
+          version: "20.04"
         nvidia-gpu:
-          name: *glibc-initrd-name
+          name: "ubuntu"
           version: "jammy"
         nvidia-gpu-confidential:
-          name: *glibc-initrd-name
+          name: "ubuntu"
           version: "jammy"
 
   kernel: