From b6ce57905b78d547d2d707d90e777ee68b82d69b Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Mon, 20 Nov 2023 09:54:04 +0100 Subject: [PATCH 1/3] fix: Add missing requirements to windows.11 preferences Manualy cherry-pick of 16096fb1e1507142ebd74d2801e3bc24884e563. CONFLICTS: - common-clusterpreferences-bundle.yaml - common-instancetypes-all-bundle.yaml - common-preferences-bundle.yaml Signed-off-by: Felix Matouschek --- common-clusterpreferences-bundle.yaml | 10 ++++++++++ common-instancetypes-all-bundle.yaml | 20 +++++++++++++++++++ .../preferences/windows/11/kustomization.yaml | 1 + common-preferences-bundle.yaml | 10 ++++++++++ 4 files changed, 41 insertions(+) diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index c281d3bd..c89b4434 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -599,6 +599,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -658,6 +663,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference diff --git a/common-instancetypes-all-bundle.yaml b/common-instancetypes-all-bundle.yaml index ab509116..fa1845b5 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -1581,6 +1581,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1640,6 +1645,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -3687,6 +3697,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3746,6 +3761,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference diff --git a/common-instancetypes/preferences/windows/11/kustomization.yaml b/common-instancetypes/preferences/windows/11/kustomization.yaml index 189f7f28..08411a48 100644 --- a/common-instancetypes/preferences/windows/11/kustomization.yaml +++ b/common-instancetypes/preferences/windows/11/kustomization.yaml @@ -9,5 +9,6 @@ resources: components: - ./metadata + - ./requirements - ../../components/tpm - ../../components/secureboot diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index 14692885..108dfff8 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -599,6 +599,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -658,6 +663,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference From d0086056a93af19200284903d3f37f929b6a90e7 Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Mon, 20 Nov 2023 10:14:49 +0100 Subject: [PATCH 2/3] fix: Add missing requirements to windows.2k16 preferences Manualy cherry-pick of f39e6c5993f1565334c2046f95019875b035b584 CONFLICTS: - common-clusterpreferences-bundle.yaml - common-instancetypes-all-bundle.yaml - common-preferences-bundle.yaml Signed-off-by: Felix Matouschek --- common-clusterpreferences-bundle.yaml | 10 ++++++++++ common-instancetypes-all-bundle.yaml | 20 +++++++++++++++++++ .../windows/2k16/kustomization.yaml | 1 + common-preferences-bundle.yaml | 10 ++++++++++ 4 files changed, 41 insertions(+) diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index c89b4434..816171b2 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -836,6 +836,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -890,6 +895,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference diff --git a/common-instancetypes-all-bundle.yaml b/common-instancetypes-all-bundle.yaml index fa1845b5..10eec634 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -1818,6 +1818,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1872,6 +1877,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -3934,6 +3944,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3988,6 +4003,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference diff --git a/common-instancetypes/preferences/windows/2k16/kustomization.yaml b/common-instancetypes/preferences/windows/2k16/kustomization.yaml index 59599be8..18636a39 100644 --- a/common-instancetypes/preferences/windows/2k16/kustomization.yaml +++ b/common-instancetypes/preferences/windows/2k16/kustomization.yaml @@ -7,5 +7,6 @@ resources: components: - ./metadata + - ./requirements nameSuffix: .2k16 diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index 108dfff8..95ba7ea9 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -836,6 +836,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -890,6 +895,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference From 23092352b7fc8d41fbacb43afa98ea427eb05dd5 Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Mon, 20 Nov 2023 10:40:19 +0100 Subject: [PATCH 3/3] fix: Move functests to u1.large instancetypes After fixing the missing requirements on windows.11 preferences, they now need at least 2 vCPUs to pass the functional tests. Signed-off-by: Felix Matouschek --- scripts/functest.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/functest.sh b/scripts/functest.sh index 5d3ea456..e7f0ad1d 100755 --- a/scripts/functest.sh +++ b/scripts/functest.sh @@ -35,9 +35,9 @@ for preference in $(${KUBECTL} get virtualmachineclusterpreferences --no-headers fi fi - # Ensure a VirtualMachine can be created when enough resources are provided using the u1.medium instance type - if ! ${VIRTCTL} create vm --instancetype u1.medium --preference "${preference}" --volume-containerdisk name:disk,src:quay.io/containerdisks/fedora:latest --name "vm-${preference}" | ${KUBECTL} apply -f - ; then - echo "functest failed on preference ${preference} using instancetype u1.medium" + # Ensure a VirtualMachine can be created when enough resources are provided using the u1.large instance type + if ! ${VIRTCTL} create vm --instancetype u1.large --preference "${preference}" --volume-containerdisk name:disk,src:quay.io/containerdisks/fedora:latest --name "vm-${preference}" | ${KUBECTL} apply -f - ; then + echo "functest failed on preference ${preference} using instancetype u1.large" exit 1 fi ${KUBECTL} delete "vm/vm-${preference}"