From 0f04b567e66aa2303cbd84f5a5db3a86b916b8f3 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 15 Jun 2023 16:38:22 +0100 Subject: [PATCH 1/7] Add Alpine resource requirements Signed-off-by: Lee Yarwood --- common-clusterpreferences-bundle.yaml | 5 +++++ common-instancetypes-all-bundle.yaml | 10 ++++++++++ .../preferences/alpine/kustomization.yaml | 1 + .../alpine/requirements/kustomization.yaml | 10 ++++++++++ .../alpine/requirements/requirements.yaml | 12 ++++++++++++ common-preferences-bundle.yaml | 5 +++++ 6 files changed, 43 insertions(+) create mode 100644 common-instancetypes/preferences/alpine/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/alpine/requirements/requirements.yaml diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index ab2b54e9..139bdec7 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -17,6 +17,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference diff --git a/common-instancetypes-all-bundle.yaml b/common-instancetypes-all-bundle.yaml index 66235423..c545def5 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -783,6 +783,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -2563,6 +2568,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference diff --git a/common-instancetypes/preferences/alpine/kustomization.yaml b/common-instancetypes/preferences/alpine/kustomization.yaml index 7ab5733d..19c0bc4e 100644 --- a/common-instancetypes/preferences/alpine/kustomization.yaml +++ b/common-instancetypes/preferences/alpine/kustomization.yaml @@ -7,6 +7,7 @@ resources: components: - ./metadata + - ./requirements - ../components/diskbus-virtio-blk - ../components/interfacemodel-virtio-net diff --git a/common-instancetypes/preferences/alpine/requirements/kustomization.yaml b/common-instancetypes/preferences/alpine/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/alpine/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/alpine/requirements/requirements.yaml b/common-instancetypes/preferences/alpine/requirements/requirements.yaml new file mode 100644 index 00000000..0bb85b09 --- /dev/null +++ b/common-instancetypes/preferences/alpine/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://wiki.alpinelinux.org/wiki/Requirements + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index c754e947..3f0b5354 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -17,6 +17,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference From 1a71d2e6c51e11c1f4dab9d97232227d5927410c Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 15 Jun 2023 16:44:26 +0100 Subject: [PATCH 2/7] Add CentOS and RHEL resource requirements Signed-off-by: Lee Yarwood --- common-clusterpreferences-bundle.yaml | 60 +++++++++ common-instancetypes-all-bundle.yaml | 120 ++++++++++++++++++ .../preferences/centos/7/kustomization.yaml | 1 + .../centos/7/requirements/kustomization.yaml | 10 ++ .../centos/7/requirements/requirements.yaml | 12 ++ .../centos/8_stream/kustomization.yaml | 1 + .../8_stream/requirements/kustomization.yaml | 10 ++ .../8_stream/requirements/requirements.yaml | 12 ++ .../centos/9_stream/kustomization.yaml | 1 + .../9_stream/requirements/kustomization.yaml | 10 ++ .../9_stream/requirements/requirements.yaml | 12 ++ .../preferences/rhel/7/kustomization.yaml | 1 + .../rhel/7/requirements/kustomization.yaml | 10 ++ .../rhel/7/requirements/requirements.yaml | 12 ++ .../preferences/rhel/8/kustomization.yaml | 1 + .../rhel/8/requirements/kustomization.yaml | 10 ++ .../rhel/8/requirements/requirements.yaml | 12 ++ .../preferences/rhel/9/kustomization.yaml | 1 + .../rhel/9/requirements/kustomization.yaml | 10 ++ .../rhel/9/requirements/requirements.yaml | 12 ++ common-preferences-bundle.yaml | 60 +++++++++ 21 files changed, 378 insertions(+) create mode 100644 common-instancetypes/preferences/centos/7/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/centos/7/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/centos/8_stream/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/centos/8_stream/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/centos/9_stream/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/centos/9_stream/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/rhel/7/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/rhel/7/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/rhel/8/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/rhel/8/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/rhel/9/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/rhel/9/requirements/requirements.yaml diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index 139bdec7..589188d5 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -41,6 +41,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -63,6 +68,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -82,6 +92,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -104,6 +119,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -130,6 +150,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -159,6 +184,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -223,6 +253,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -245,6 +280,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -264,6 +304,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -286,6 +331,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -312,6 +362,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -341,6 +396,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference diff --git a/common-instancetypes-all-bundle.yaml b/common-instancetypes-all-bundle.yaml index c545def5..79126b09 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -807,6 +807,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -829,6 +834,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -848,6 +858,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -870,6 +885,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -896,6 +916,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -925,6 +950,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -989,6 +1019,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1011,6 +1046,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1030,6 +1070,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1052,6 +1097,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1078,6 +1128,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1107,6 +1162,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -2592,6 +2652,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2614,6 +2679,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2633,6 +2703,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2655,6 +2730,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2681,6 +2761,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2710,6 +2795,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2774,6 +2864,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2796,6 +2891,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2815,6 +2915,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2837,6 +2942,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2863,6 +2973,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -2892,6 +3007,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference diff --git a/common-instancetypes/preferences/centos/7/kustomization.yaml b/common-instancetypes/preferences/centos/7/kustomization.yaml index a0d43ca7..2bde5ba0 100644 --- a/common-instancetypes/preferences/centos/7/kustomization.yaml +++ b/common-instancetypes/preferences/centos/7/kustomization.yaml @@ -6,5 +6,6 @@ resources: components: - ./metadata + - ./requirements nameSuffix: ".7" diff --git a/common-instancetypes/preferences/centos/7/requirements/kustomization.yaml b/common-instancetypes/preferences/centos/7/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/centos/7/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/centos/7/requirements/requirements.yaml b/common-instancetypes/preferences/centos/7/requirements/requirements.yaml new file mode 100644 index 00000000..2a3e9b75 --- /dev/null +++ b/common-instancetypes/preferences/centos/7/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://access.redhat.com/articles/rhel-limits#minimum-required-memory-3 + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi diff --git a/common-instancetypes/preferences/centos/8_stream/kustomization.yaml b/common-instancetypes/preferences/centos/8_stream/kustomization.yaml index a50d908d..64df467d 100644 --- a/common-instancetypes/preferences/centos/8_stream/kustomization.yaml +++ b/common-instancetypes/preferences/centos/8_stream/kustomization.yaml @@ -7,5 +7,6 @@ resources: components: - ./metadata + - ./requirements nameSuffix: ".8.stream" diff --git a/common-instancetypes/preferences/centos/8_stream/requirements/kustomization.yaml b/common-instancetypes/preferences/centos/8_stream/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/centos/8_stream/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/centos/8_stream/requirements/requirements.yaml b/common-instancetypes/preferences/centos/8_stream/requirements/requirements.yaml new file mode 100644 index 00000000..9e6c4a07 --- /dev/null +++ b/common-instancetypes/preferences/centos/8_stream/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://access.redhat.com/articles/rhel-limits#minimum-required-memory-3 + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi diff --git a/common-instancetypes/preferences/centos/9_stream/kustomization.yaml b/common-instancetypes/preferences/centos/9_stream/kustomization.yaml index 271638ef..681d75cf 100644 --- a/common-instancetypes/preferences/centos/9_stream/kustomization.yaml +++ b/common-instancetypes/preferences/centos/9_stream/kustomization.yaml @@ -9,6 +9,7 @@ nameSuffix: ".9.stream" components: - ./metadata + - ./requirements - ../../components/rng - ../../components/secureboot - ../../components/disk-dedicatediothread diff --git a/common-instancetypes/preferences/centos/9_stream/requirements/kustomization.yaml b/common-instancetypes/preferences/centos/9_stream/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/centos/9_stream/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/centos/9_stream/requirements/requirements.yaml b/common-instancetypes/preferences/centos/9_stream/requirements/requirements.yaml new file mode 100644 index 00000000..9e6c4a07 --- /dev/null +++ b/common-instancetypes/preferences/centos/9_stream/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://access.redhat.com/articles/rhel-limits#minimum-required-memory-3 + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi diff --git a/common-instancetypes/preferences/rhel/7/kustomization.yaml b/common-instancetypes/preferences/rhel/7/kustomization.yaml index 290cb86a..5588683f 100644 --- a/common-instancetypes/preferences/rhel/7/kustomization.yaml +++ b/common-instancetypes/preferences/rhel/7/kustomization.yaml @@ -7,5 +7,6 @@ resources: components: - ./metadata + - ./requirements nameSuffix: ".7" diff --git a/common-instancetypes/preferences/rhel/7/requirements/kustomization.yaml b/common-instancetypes/preferences/rhel/7/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/rhel/7/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/rhel/7/requirements/requirements.yaml b/common-instancetypes/preferences/rhel/7/requirements/requirements.yaml new file mode 100644 index 00000000..2a3e9b75 --- /dev/null +++ b/common-instancetypes/preferences/rhel/7/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://access.redhat.com/articles/rhel-limits#minimum-required-memory-3 + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi diff --git a/common-instancetypes/preferences/rhel/8/kustomization.yaml b/common-instancetypes/preferences/rhel/8/kustomization.yaml index 6790286a..05010044 100644 --- a/common-instancetypes/preferences/rhel/8/kustomization.yaml +++ b/common-instancetypes/preferences/rhel/8/kustomization.yaml @@ -7,5 +7,6 @@ resources: components: - ./metadata + - ./requirements nameSuffix: ".8" diff --git a/common-instancetypes/preferences/rhel/8/requirements/kustomization.yaml b/common-instancetypes/preferences/rhel/8/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/rhel/8/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/rhel/8/requirements/requirements.yaml b/common-instancetypes/preferences/rhel/8/requirements/requirements.yaml new file mode 100644 index 00000000..9e6c4a07 --- /dev/null +++ b/common-instancetypes/preferences/rhel/8/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://access.redhat.com/articles/rhel-limits#minimum-required-memory-3 + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi diff --git a/common-instancetypes/preferences/rhel/9/kustomization.yaml b/common-instancetypes/preferences/rhel/9/kustomization.yaml index a05811ed..8bf46c64 100644 --- a/common-instancetypes/preferences/rhel/9/kustomization.yaml +++ b/common-instancetypes/preferences/rhel/9/kustomization.yaml @@ -8,6 +8,7 @@ nameSuffix: ".9" components: - ./metadata + - ./requirements - ../../components/disk-dedicatediothread - ../../components/rng - ../../components/secureboot diff --git a/common-instancetypes/preferences/rhel/9/requirements/kustomization.yaml b/common-instancetypes/preferences/rhel/9/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/rhel/9/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/rhel/9/requirements/requirements.yaml b/common-instancetypes/preferences/rhel/9/requirements/requirements.yaml new file mode 100644 index 00000000..9e6c4a07 --- /dev/null +++ b/common-instancetypes/preferences/rhel/9/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://access.redhat.com/articles/rhel-limits#minimum-required-memory-3 + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index 3f0b5354..7a6c17ba 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -41,6 +41,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -63,6 +68,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -82,6 +92,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -104,6 +119,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -130,6 +150,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -159,6 +184,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -223,6 +253,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -245,6 +280,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -264,6 +304,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -286,6 +331,11 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -312,6 +362,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -341,6 +396,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference From 867b5d99d8955a9e8c669c8f57256b952a30a1fd Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 15 Jun 2023 16:45:08 +0100 Subject: [PATCH 3/7] Add CirrOS resource requirements Signed-off-by: Lee Yarwood --- common-clusterpreferences-bundle.yaml | 5 +++++ common-instancetypes-all-bundle.yaml | 10 ++++++++++ .../preferences/cirros/kustomization.yaml | 1 + .../cirros/requirements/kustomization.yaml | 10 ++++++++++ .../cirros/requirements/requirements.yaml | 12 ++++++++++++ common-preferences-bundle.yaml | 5 +++++ 6 files changed, 43 insertions(+) create mode 100644 common-instancetypes/preferences/cirros/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/cirros/requirements/requirements.yaml diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index 589188d5..9f7d42d2 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -208,6 +208,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 256Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference diff --git a/common-instancetypes-all-bundle.yaml b/common-instancetypes-all-bundle.yaml index 79126b09..235e86a1 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -974,6 +974,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 256Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -2819,6 +2824,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 256Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference diff --git a/common-instancetypes/preferences/cirros/kustomization.yaml b/common-instancetypes/preferences/cirros/kustomization.yaml index 06c27a05..62fdebda 100644 --- a/common-instancetypes/preferences/cirros/kustomization.yaml +++ b/common-instancetypes/preferences/cirros/kustomization.yaml @@ -7,6 +7,7 @@ resources: components: - ./metadata + - ./requirements - ../components/diskbus-virtio-blk - ../components/interfacemodel-virtio-net diff --git a/common-instancetypes/preferences/cirros/requirements/kustomization.yaml b/common-instancetypes/preferences/cirros/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/cirros/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/cirros/requirements/requirements.yaml b/common-instancetypes/preferences/cirros/requirements/requirements.yaml new file mode 100644 index 00000000..5ce5c938 --- /dev/null +++ b/common-instancetypes/preferences/cirros/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://github.com/cirros-dev/cirros/issues/53 + requirements: + cpu: + guest: 1 + memory: + guest: 256Mi diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index 7a6c17ba..20f659c7 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -208,6 +208,11 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 256Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference From d4c15391673639ccc7a9e39109e579b2da442e6c Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 15 Jun 2023 16:45:27 +0100 Subject: [PATCH 4/7] Add Fedora resource requirements Signed-off-by: Lee Yarwood --- common-clusterpreferences-bundle.yaml | 5 +++++ common-instancetypes-all-bundle.yaml | 10 ++++++++++ .../preferences/fedora/kustomization.yaml | 1 + .../fedora/requirements/kustomization.yaml | 10 ++++++++++ .../fedora/requirements/requirements.yaml | 12 ++++++++++++ common-preferences-bundle.yaml | 5 +++++ 6 files changed, 43 insertions(+) create mode 100644 common-instancetypes/preferences/fedora/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/fedora/requirements/requirements.yaml diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index 9f7d42d2..fa9a4fc1 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -239,6 +239,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + 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 235e86a1..b24c6931 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -1005,6 +1005,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -2855,6 +2860,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference diff --git a/common-instancetypes/preferences/fedora/kustomization.yaml b/common-instancetypes/preferences/fedora/kustomization.yaml index 7395b6ce..0307dc6f 100644 --- a/common-instancetypes/preferences/fedora/kustomization.yaml +++ b/common-instancetypes/preferences/fedora/kustomization.yaml @@ -6,6 +6,7 @@ resources: components: - ./metadata + - ./requirements - ../components/diskbus-virtio-blk - ../components/interfacemodel-virtio-net - ../components/rng diff --git a/common-instancetypes/preferences/fedora/requirements/kustomization.yaml b/common-instancetypes/preferences/fedora/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/fedora/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/fedora/requirements/requirements.yaml b/common-instancetypes/preferences/fedora/requirements/requirements.yaml new file mode 100644 index 00000000..155e00f9 --- /dev/null +++ b/common-instancetypes/preferences/fedora/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://docs.fedoraproject.org/en-US/fedora/latest/release-notes/welcome/Hardware_Overview/ + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index 20f659c7..985e4004 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -239,6 +239,11 @@ spec: firmware: preferredUseEfi: true preferredUseSecureBoot: true + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference From 92fe0b392ddb2a889754b5158cd8fd07740c9b96 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 15 Jun 2023 16:45:52 +0100 Subject: [PATCH 5/7] Add Ubuntu resource requirements Signed-off-by: Lee Yarwood --- common-clusterpreferences-bundle.yaml | 5 +++++ common-instancetypes-all-bundle.yaml | 10 ++++++++++ .../preferences/ubuntu/kustomization.yaml | 1 + .../ubuntu/requirements/kustomization.yaml | 10 ++++++++++ .../ubuntu/requirements/requirements.yaml | 12 ++++++++++++ common-preferences-bundle.yaml | 5 +++++ 6 files changed, 43 insertions(+) create mode 100644 common-instancetypes/preferences/ubuntu/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/ubuntu/requirements/requirements.yaml diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index fa9a4fc1..d41e53cc 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -431,6 +431,11 @@ spec: preferredDiskBus: virtio preferredInterfaceModel: virtio preferredRng: {} + 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 b24c6931..df60365d 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -1197,6 +1197,11 @@ spec: preferredDiskBus: virtio preferredInterfaceModel: virtio preferredRng: {} + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -3052,6 +3057,11 @@ spec: preferredDiskBus: virtio preferredInterfaceModel: virtio preferredRng: {} + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference diff --git a/common-instancetypes/preferences/ubuntu/kustomization.yaml b/common-instancetypes/preferences/ubuntu/kustomization.yaml index 685429fc..8a4643d4 100644 --- a/common-instancetypes/preferences/ubuntu/kustomization.yaml +++ b/common-instancetypes/preferences/ubuntu/kustomization.yaml @@ -6,6 +6,7 @@ resources: components: - ./metadata + - ./requirements - ../components/diskbus-virtio-blk - ../components/interfacemodel-virtio-net - ../components/rng diff --git a/common-instancetypes/preferences/ubuntu/requirements/kustomization.yaml b/common-instancetypes/preferences/ubuntu/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/ubuntu/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/ubuntu/requirements/requirements.yaml b/common-instancetypes/preferences/ubuntu/requirements/requirements.yaml new file mode 100644 index 00000000..8c005b60 --- /dev/null +++ b/common-instancetypes/preferences/ubuntu/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://ubuntu.com/server/docs/installation + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index 985e4004..1d805901 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -431,6 +431,11 @@ spec: preferredDiskBus: virtio preferredInterfaceModel: virtio preferredRng: {} + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference From 943bfba7a5f73cf6b4347e35404fa6579af5e871 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 15 Jun 2023 17:32:53 +0100 Subject: [PATCH 6/7] Add Windows resource requirements Signed-off-by: Lee Yarwood --- common-clusterpreferences-bundle.yaml | 40 ++++++++++ common-instancetypes-all-bundle.yaml | 80 +++++++++++++++++++ .../preferences/windows/10/kustomization.yaml | 1 + .../10/requirements/kustomization.yaml | 10 +++ .../windows/10/requirements/requirements.yaml | 12 +++ .../11/requirements/kustomization.yaml | 10 +++ .../windows/11/requirements/requirements.yaml | 12 +++ .../windows/2k12/kustomization.yaml | 1 + .../2k12/requirements/kustomization.yaml | 10 +++ .../2k12/requirements/requirements.yaml | 12 +++ .../2k16/requirements/kustomization.yaml | 10 +++ .../2k16/requirements/requirements.yaml | 12 +++ .../windows/2k19/kustomization.yaml | 1 + .../2k19/requirements/kustomization.yaml | 10 +++ .../2k19/requirements/requirements.yaml | 12 +++ .../windows/2k22/kustomization.yaml | 1 + .../2k22/requirements/kustomization.yaml | 10 +++ .../2k22/requirements/requirements.yaml | 12 +++ common-preferences-bundle.yaml | 40 ++++++++++ 19 files changed, 296 insertions(+) create mode 100644 common-instancetypes/preferences/windows/10/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/windows/10/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/windows/11/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/windows/11/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/windows/2k12/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/windows/2k12/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/windows/2k16/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/windows/2k16/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/windows/2k19/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/windows/2k19/requirements/requirements.yaml create mode 100644 common-instancetypes/preferences/windows/2k22/requirements/kustomization.yaml create mode 100644 common-instancetypes/preferences/windows/2k22/requirements/requirements.yaml diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index d41e53cc..001882f8 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -488,6 +488,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -542,6 +547,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -710,6 +720,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -764,6 +779,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -922,6 +942,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -976,6 +1001,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1033,6 +1063,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1092,3 +1127,8 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi diff --git a/common-instancetypes-all-bundle.yaml b/common-instancetypes-all-bundle.yaml index df60365d..a11d9c85 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -1254,6 +1254,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1308,6 +1313,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1476,6 +1486,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1530,6 +1545,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1688,6 +1708,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1742,6 +1767,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1799,6 +1829,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference @@ -1858,6 +1893,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineInstancetype @@ -3114,6 +3154,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3168,6 +3213,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3336,6 +3386,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3390,6 +3445,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3548,6 +3608,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3602,6 +3667,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3659,6 +3729,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -3718,3 +3793,8 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi diff --git a/common-instancetypes/preferences/windows/10/kustomization.yaml b/common-instancetypes/preferences/windows/10/kustomization.yaml index eb4a0a48..a784c5c3 100644 --- a/common-instancetypes/preferences/windows/10/kustomization.yaml +++ b/common-instancetypes/preferences/windows/10/kustomization.yaml @@ -7,5 +7,6 @@ resources: components: - ./metadata + - ./requirements nameSuffix: ".10" diff --git a/common-instancetypes/preferences/windows/10/requirements/kustomization.yaml b/common-instancetypes/preferences/windows/10/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/windows/10/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/windows/10/requirements/requirements.yaml b/common-instancetypes/preferences/windows/10/requirements/requirements.yaml new file mode 100644 index 00000000..f0442f72 --- /dev/null +++ b/common-instancetypes/preferences/windows/10/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://support.microsoft.com/en-us/windows/windows-10-system-requirements-6d4e9a79-66bf-7950-467c-795cf0386715 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi diff --git a/common-instancetypes/preferences/windows/11/requirements/kustomization.yaml b/common-instancetypes/preferences/windows/11/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/windows/11/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/windows/11/requirements/requirements.yaml b/common-instancetypes/preferences/windows/11/requirements/requirements.yaml new file mode 100644 index 00000000..d2eb5b8e --- /dev/null +++ b/common-instancetypes/preferences/windows/11/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://www.microsoft.com/en-gb/windows/windows-11-specifications?r=1 + requirements: + cpu: + guest: 1 + memory: + guest: 4Gi diff --git a/common-instancetypes/preferences/windows/2k12/kustomization.yaml b/common-instancetypes/preferences/windows/2k12/kustomization.yaml index eb0f78c6..eadb8912 100644 --- a/common-instancetypes/preferences/windows/2k12/kustomization.yaml +++ b/common-instancetypes/preferences/windows/2k12/kustomization.yaml @@ -7,5 +7,6 @@ resources: components: - ./metadata + - ./requirements nameSuffix: .2k12 diff --git a/common-instancetypes/preferences/windows/2k12/requirements/kustomization.yaml b/common-instancetypes/preferences/windows/2k12/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/windows/2k12/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/windows/2k12/requirements/requirements.yaml b/common-instancetypes/preferences/windows/2k12/requirements/requirements.yaml new file mode 100644 index 00000000..ecbb2ca1 --- /dev/null +++ b/common-instancetypes/preferences/windows/2k12/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/dn303418(v=ws.11) + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi diff --git a/common-instancetypes/preferences/windows/2k16/requirements/kustomization.yaml b/common-instancetypes/preferences/windows/2k16/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/windows/2k16/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/windows/2k16/requirements/requirements.yaml b/common-instancetypes/preferences/windows/2k16/requirements/requirements.yaml new file mode 100644 index 00000000..4ca3f546 --- /dev/null +++ b/common-instancetypes/preferences/windows/2k16/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://learn.microsoft.com/en-us/windows-server/get-started/hardware-requirements + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi diff --git a/common-instancetypes/preferences/windows/2k19/kustomization.yaml b/common-instancetypes/preferences/windows/2k19/kustomization.yaml index 98ccb6d5..3986a3cf 100644 --- a/common-instancetypes/preferences/windows/2k19/kustomization.yaml +++ b/common-instancetypes/preferences/windows/2k19/kustomization.yaml @@ -7,5 +7,6 @@ resources: components: - ./metadata + - ./requirements nameSuffix: .2k19 diff --git a/common-instancetypes/preferences/windows/2k19/requirements/kustomization.yaml b/common-instancetypes/preferences/windows/2k19/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/windows/2k19/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/windows/2k19/requirements/requirements.yaml b/common-instancetypes/preferences/windows/2k19/requirements/requirements.yaml new file mode 100644 index 00000000..4ca3f546 --- /dev/null +++ b/common-instancetypes/preferences/windows/2k19/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://learn.microsoft.com/en-us/windows-server/get-started/hardware-requirements + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi diff --git a/common-instancetypes/preferences/windows/2k22/kustomization.yaml b/common-instancetypes/preferences/windows/2k22/kustomization.yaml index 25ed88e7..b4245a5d 100644 --- a/common-instancetypes/preferences/windows/2k22/kustomization.yaml +++ b/common-instancetypes/preferences/windows/2k22/kustomization.yaml @@ -7,6 +7,7 @@ resources: components: - ./metadata + - ./requirements - ../../components/tpm - ../../components/secureboot diff --git a/common-instancetypes/preferences/windows/2k22/requirements/kustomization.yaml b/common-instancetypes/preferences/windows/2k22/requirements/kustomization.yaml new file mode 100644 index 00000000..971f6e03 --- /dev/null +++ b/common-instancetypes/preferences/windows/2k22/requirements/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patches: + - path: ./requirements.yaml + target: + kind: VirtualMachinePreference + - path: ./requirements.yaml + target: + kind: VirtualMachineClusterPreference diff --git a/common-instancetypes/preferences/windows/2k22/requirements/requirements.yaml b/common-instancetypes/preferences/windows/2k22/requirements/requirements.yaml new file mode 100644 index 00000000..4ca3f546 --- /dev/null +++ b/common-instancetypes/preferences/windows/2k22/requirements/requirements.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachinePreference +metadata: + name: requirements +spec: + # https://learn.microsoft.com/en-us/windows-server/get-started/hardware-requirements + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index 1d805901..189f84b0 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -488,6 +488,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -542,6 +547,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -710,6 +720,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -764,6 +779,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -922,6 +942,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -976,6 +1001,11 @@ spec: vapic: {} vpindex: {} preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -1033,6 +1063,11 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachinePreference @@ -1092,3 +1127,8 @@ spec: preferredUseEfi: true preferredUseSecureBoot: true preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi From 37dbb7ea036dd2a8dc2481d33c6ff65bc1028ca9 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 15 Jun 2023 18:17:45 +0100 Subject: [PATCH 7/7] Use n1.medium during preference functional tests Given that all preferences now have resource requirements we need to actually provide adequate resources to the VirtualMachine. A negative test is also added for each preference ensuring that requests to create a VirtualMachine using an instance type that doesn't provide enough resources are rejected. Additionally the use of virtctl is introduced, removing a long standing TODO from both the preference and instance type tests. Signed-off-by: Lee Yarwood --- scripts/functest.sh | 74 ++++++++++++++----------------------------- scripts/kubevirt.sh | 3 +- scripts/kubevirtci.sh | 3 +- 3 files changed, 27 insertions(+), 53 deletions(-) diff --git a/scripts/functest.sh b/scripts/functest.sh index 5ef18c5d..e24a0d36 100755 --- a/scripts/functest.sh +++ b/scripts/functest.sh @@ -14,68 +14,40 @@ # See the License for the specific language governing permissions and # limitations under the License. -if [ -z "${KUBECTL}" ]; then - echo "${BASH_SOURCE[0]} expects the following env variables to be provided: KUBECTL." +if [ -z "${KUBECTL}" ] || [ -z "${VIRTCTL}" ]; then + echo "${BASH_SOURCE[0]} expects the following env variables to be provided: KUBECTL, VIRTCTL." exit 1 fi +# Create a custom tiny instance type for negative tests around preference resource requirements +${VIRTCTL} create instancetype --cpu 1 --memory 64Mi --name tiny | ${KUBECTL} apply -f - + # This func test simply loops over the installed instance types and preferences, assigning each to a VirtualMachine to ensure they are accepted by the webhooks for preference in $(${KUBECTL} get virtualmachineclusterpreferences --no-headers -o custom-columns=':metadata.name'); do - # TODO(lyarwood): Replace with virtctl create vm once 0.59.0 is released - # ${VIRTCTL} create vm --preference ${preference} - ${KUBECTL} apply -f - << EOF ---- -apiVersion: kubevirt.io/v1 -kind: VirtualMachine -metadata: - name: vm-${preference} -spec: - preference: - name: ${preference} - running: false - template: - spec: - domain: - devices: {} - volumes: - - containerDisk: - image: quay.io/containerdisks/fedora:37 - name: containerdisk -EOF - # We can't inline the above creation call below so stash the return code and check it to keep shellcheck happy - ret=$? - if [ $ret -ne 0 ]; then - echo "functest failed on preference ${preference}" + + # Ensure a VirtualMachine using a preference with resource requirements is rejected if it does not provide enough resources. + if ${KUBECTL} get virtualmachineclusterpreferences/"${preference}" -o json | jq -er .spec.requirements > /dev/null 2>&1; then + # TODO(lyarwood): virtctl should be extended with a --cpu switch to allow the non instancetype use case to be tested here + if ${VIRTCTL} create vm --instancetype tiny --preference "${preference}" --volume-containerdisk name:disk,src:quay.io/containerdisks/fedora:latest --name "vm-${preference}-requirements" | ${KUBECTL} apply -f - ; then + echo "functest failed - Preference ${preference} should not be able to use virtualmachineclusterinstancetype tiny" + ${KUBECTL} delete "vm/vm-${preference}-requirements" + exit 1 + fi + fi + + # Ensure a VirtualMachine can be created when enough resources are provided using the n1.medium instance type + if ! ${VIRTCTL} create vm --instancetype n1.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 n1.medium" exit 1 fi ${KUBECTL} delete "vm/vm-${preference}" done +# Cleanup the custom instancetype +${KUBECTL} delete virtualmachineclusterinstancetypes/tiny + for instancetype in $(${KUBECTL} get virtualmachineclusterinstancetypes --no-headers -o custom-columns=':metadata.name'); do - # TODO(lyarwood): Replace with virtctl create vm once 0.59.0 is released - # ${VIRTCTL} create vm --instance-type ${instancetype} - ${KUBECTL} apply -f - << EOF ---- -apiVersion: kubevirt.io/v1 -kind: VirtualMachine -metadata: - name: vm-${instancetype} -spec: - instancetype: - name: ${instancetype} - running: false - template: - spec: - domain: - devices: {} - volumes: - - containerDisk: - image: quay.io/containerdisks/fedora:37 - name: containerdisk -EOF - # We can't inline the above creation call below so stash the return code and check it to keep shellcheck happy - ret=$? - if [ $ret -ne 0 ]; then + if ! ${VIRTCTL} create vm --instancetype "${instancetype}" --volume-containerdisk name:disk,src:quay.io/containerdisks/fedora:latest --name "vm-${instancetype}" | ${KUBECTL} apply -f - ; then echo "functest failed on instance type ${instancetype}" exit 1 fi diff --git a/scripts/kubevirt.sh b/scripts/kubevirt.sh index c192d36a..eaffd430 100755 --- a/scripts/kubevirt.sh +++ b/scripts/kubevirt.sh @@ -20,6 +20,7 @@ _base_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd) _kubectl="${_base_dir}/_kubevirt/cluster-up/kubectl.sh" _kubessh="${_base_dir}/_kubevirt/cluster-up/ssh.sh" _kubevirtcicli="${_base_dir}/_kubevirt/cluster-up/cli.sh" +_virtctl="${_base_dir}/_kubevirt/cluster-up/virtctl.sh" _action=$1 shift @@ -50,7 +51,7 @@ function kubevirt::registry() { } function kubevirtci::functest() { - KUBECTL=${_kubectl} "${_base_dir}/scripts/functest.sh" + KUBECTL=${_kubectl} VIRTCTL=${_virtctl} "${_base_dir}/scripts/functest.sh" } kubevirt::install diff --git a/scripts/kubevirtci.sh b/scripts/kubevirtci.sh index d32970e6..50aada7f 100755 --- a/scripts/kubevirtci.sh +++ b/scripts/kubevirtci.sh @@ -24,6 +24,7 @@ _cluster_up_dir="${_base_dir}/_cluster-up" _kubectl="${_cluster_up_dir}/cluster-up/kubectl.sh" _kubessh="${_cluster_up_dir}/cluster-up/ssh.sh" _kubevirtcicli="${_cluster_up_dir}/cluster-up/cli.sh" +_virtctl="${_cluster_up_dir}/cluster-up/virtctl.sh" _action=$1 shift @@ -71,7 +72,7 @@ function kubevirtci::kubeconfig() { } function kubevirtci::functest() { - KUBECTL=${_kubectl} "${_base_dir}/scripts/functest.sh" + KUBECTL=${_kubectl} VIRTCTL=${_virtctl} "${_base_dir}/scripts/functest.sh" } kubevirtci::fetch_kubevirtci