From 8624fae4df117e2d3fec36d5527afb5214c822ff Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Wed, 10 Apr 2024 14:36:35 +0100 Subject: [PATCH] Set architecture to amd64 across all templates The current set of templates are only verified on amd64 so to avoid users attempting to run them on aarch64 etc set the architecture within the VirtualMachineInstanceSpec. Signed-off-by: Lee Yarwood --- templates/centos-stream8.tpl.yaml | 1 + templates/centos-stream9.tpl.yaml | 1 + templates/centos6.tpl.yaml | 1 + templates/centos7.tpl.yaml | 1 + templates/fedora.tpl.yaml | 1 + templates/opensuse.tpl.yaml | 1 + templates/rhel7.tpl.yaml | 1 + templates/rhel8.tpl.yaml | 1 + templates/rhel9.tpl.yaml | 1 + templates/ubuntu.tpl.yaml | 1 + templates/windows10.tpl.yaml | 1 + templates/windows11.tpl.yaml | 1 + templates/windows2k12.tpl.yaml | 1 + templates/windows2k16.tpl.yaml | 1 + templates/windows2k19.tpl.yaml | 1 + templates/windows2k22.tpl.yaml | 1 + 16 files changed, 16 insertions(+) diff --git a/templates/centos-stream8.tpl.yaml b/templates/centos-stream8.tpl.yaml index 48403e5a..6410a85b 100644 --- a/templates/centos-stream8.tpl.yaml +++ b/templates/centos-stream8.tpl.yaml @@ -96,6 +96,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/centos-stream9.tpl.yaml b/templates/centos-stream9.tpl.yaml index 37737c01..bbb0a60b 100644 --- a/templates/centos-stream9.tpl.yaml +++ b/templates/centos-stream9.tpl.yaml @@ -96,6 +96,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/centos6.tpl.yaml b/templates/centos6.tpl.yaml index b512ff4a..6bdb27b4 100644 --- a/templates/centos6.tpl.yaml +++ b/templates/centos6.tpl.yaml @@ -86,6 +86,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/centos7.tpl.yaml b/templates/centos7.tpl.yaml index a853e898..76c66ad1 100644 --- a/templates/centos7.tpl.yaml +++ b/templates/centos7.tpl.yaml @@ -96,6 +96,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/fedora.tpl.yaml b/templates/fedora.tpl.yaml index f305be67..8b97bea7 100644 --- a/templates/fedora.tpl.yaml +++ b/templates/fedora.tpl.yaml @@ -95,6 +95,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: features: smm: diff --git a/templates/opensuse.tpl.yaml b/templates/opensuse.tpl.yaml index d98ba256..6fd6e9c9 100644 --- a/templates/opensuse.tpl.yaml +++ b/templates/opensuse.tpl.yaml @@ -90,6 +90,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/rhel7.tpl.yaml b/templates/rhel7.tpl.yaml index c2bad188..8b85f64e 100644 --- a/templates/rhel7.tpl.yaml +++ b/templates/rhel7.tpl.yaml @@ -90,6 +90,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/rhel8.tpl.yaml b/templates/rhel8.tpl.yaml index 855b8788..2c26a053 100644 --- a/templates/rhel8.tpl.yaml +++ b/templates/rhel8.tpl.yaml @@ -92,6 +92,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/rhel9.tpl.yaml b/templates/rhel9.tpl.yaml index ac93bf74..09026ed2 100644 --- a/templates/rhel9.tpl.yaml +++ b/templates/rhel9.tpl.yaml @@ -92,6 +92,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/ubuntu.tpl.yaml b/templates/ubuntu.tpl.yaml index b47ae5b7..0b5b976c 100644 --- a/templates/ubuntu.tpl.yaml +++ b/templates/ubuntu.tpl.yaml @@ -96,6 +96,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: {% if item.iothreads %} ioThreadsPolicy: shared diff --git a/templates/windows10.tpl.yaml b/templates/windows10.tpl.yaml index 3f7e5e51..f79ea9d2 100644 --- a/templates/windows10.tpl.yaml +++ b/templates/windows10.tpl.yaml @@ -101,6 +101,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: clock: utc: {} diff --git a/templates/windows11.tpl.yaml b/templates/windows11.tpl.yaml index 154f62a4..c6e012b2 100644 --- a/templates/windows11.tpl.yaml +++ b/templates/windows11.tpl.yaml @@ -107,6 +107,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: clock: utc: {} diff --git a/templates/windows2k12.tpl.yaml b/templates/windows2k12.tpl.yaml index 1d9383e6..552b53be 100644 --- a/templates/windows2k12.tpl.yaml +++ b/templates/windows2k12.tpl.yaml @@ -102,6 +102,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: clock: utc: {} diff --git a/templates/windows2k16.tpl.yaml b/templates/windows2k16.tpl.yaml index e25ac7e2..3647cb4c 100644 --- a/templates/windows2k16.tpl.yaml +++ b/templates/windows2k16.tpl.yaml @@ -101,6 +101,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: clock: utc: {} diff --git a/templates/windows2k19.tpl.yaml b/templates/windows2k19.tpl.yaml index 4423609e..78439f05 100644 --- a/templates/windows2k19.tpl.yaml +++ b/templates/windows2k19.tpl.yaml @@ -101,6 +101,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: clock: utc: {} diff --git a/templates/windows2k22.tpl.yaml b/templates/windows2k22.tpl.yaml index c0a35723..1327b330 100644 --- a/templates/windows2k22.tpl.yaml +++ b/templates/windows2k22.tpl.yaml @@ -101,6 +101,7 @@ objects: kubevirt.io/domain: ${NAME} kubevirt.io/size: {{ item.flavor }} spec: + architecture: amd64 domain: clock: utc: {}