feat: s390x Ubuntu enablement

Signed-off-by: Nestor Acuna Blanco <[email protected]>
kubevirt · Nov 26, 2024 · 4864d7d · 4864d7d
1 parent 99a9380
commit 4864d7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/generate-templates.yaml b/generate-templates.yaml
@@ -245,8 +245,8 @@
 
   - name: Load Ubuntu containerdisk and image urls
     set_fact:
-      ubuntu_containerdisk_urls: "{{ ubuntu_containerdisk_urls |default([]) + lookup('osinfo', item) |attr('image_list') |selectattr('architecture', 'eq', 'x86_64') |selectattr('format', 'eq', 'containerdisk') |map(attribute='url') |map('replace', 'docker://', '') |list }}"
-      ubuntu_image_urls: "{{ ubuntu_image_urls |default([]) + lookup('osinfo', item) |attr('image_list') |selectattr('architecture', 'eq', 'x86_64') |selectattr('format', 'in', ['raw', 'qcow2']) |map(attribute='url') |list }}"
+      ubuntu_containerdisk_urls: "{{ ubuntu_containerdisk_urls |default([]) + lookup('osinfo', item) |attr('image_list') |selectattr('architecture', 'eq', target_arch) |selectattr('format', 'eq', 'containerdisk') |map(attribute='url') |map('replace', 'docker://', '') |list }}"
+      ubuntu_image_urls: "{{ ubuntu_image_urls |default([]) + lookup('osinfo', item) |attr('image_list') |selectattr('architecture', 'eq', target_arch) |selectattr('format', 'in', ['raw', 'qcow2']) |map(attribute='url') |list }}"
     loop: "{{ ubuntu_labels }}"
 
   - name: Generate Ubuntu templates

diff --git a/templates/ubuntu.tpl.yaml b/templates/ubuntu.tpl.yaml
@@ -96,7 +96,7 @@ objects:
           kubevirt.io/domain: ${NAME}
           kubevirt.io/size: {{ item.flavor }}
       spec:
-        architecture: amd64
+        architecture: "{{ 'amd64' if target_arch == 'x86_64' else target_arch }}"
         domain:
 {% if item.iothreads %}
           ioThreadsPolicy: shared