Merge pull request #184 from kubevirt-bot/cherry-pick-183-to-release-1.0

[release-1.0] Fix use of interface multi-queue within `Fedora` and `RHEL/CentOS DPDK` preferences
kubevirt · Jun 20, 2024 · 81b13fc · 81b13fc
2 parents 2e29e04 + 9ce794d
commit 81b13fc
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 5 deletions.
diff --git a/preferences/centos/8_stream_dpdk/kustomization.yaml b/preferences/centos/8_stream_dpdk/kustomization.yaml
@@ -7,7 +7,8 @@ resources:
 
 components:
   - ./metadata
-  - ../../components/cpu-topology-spread
+  - ./requirements
+  - ../../components/cpu-topology-sockets
   - ../../components/interface-multiqueue
 
 nameSuffix: ".dpdk"
diff --git a/preferences/centos/8_stream_dpdk/requirements/kustomization.yaml b/preferences/centos/8_stream_dpdk/requirements/kustomization.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./requirements.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./requirements.yaml
+    target:
+      kind: VirtualMachineClusterPreference
diff --git a/preferences/centos/8_stream_dpdk/requirements/requirements.yaml b/preferences/centos/8_stream_dpdk/requirements/requirements.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachinePreference
+metadata:
+  name: requirements
+spec:
+  requirements:
+    cpu:
+      guest: 2
+    memory:
+      guest: 1.5Gi
diff --git a/preferences/centos/9_stream_dpdk/kustomization.yaml b/preferences/centos/9_stream_dpdk/kustomization.yaml
@@ -7,7 +7,8 @@ resources:
 
 components:
   - ./metadata
-  - ../../components/cpu-topology-spread
+  - ./requirements
+  - ../../components/cpu-topology-sockets
   - ../../components/interface-multiqueue
 
 nameSuffix: ".dpdk"
diff --git a/preferences/centos/9_stream_dpdk/requirements/kustomization.yaml b/preferences/centos/9_stream_dpdk/requirements/kustomization.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./requirements.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./requirements.yaml
+    target:
+      kind: VirtualMachineClusterPreference
diff --git a/preferences/centos/9_stream_dpdk/requirements/requirements.yaml b/preferences/centos/9_stream_dpdk/requirements/requirements.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachinePreference
+metadata:
+  name: requirements
+spec:
+  requirements:
+    cpu:
+      guest: 2
+    memory:
+      guest: 1.5Gi
diff --git a/preferences/fedora/kustomization.yaml b/preferences/fedora/kustomization.yaml
@@ -12,7 +12,6 @@ components:
   - ../components/interfacemodel-virtio-net
   - ../components/rng
   - ../components/secureboot
-  - ../components/interface-multiqueue
 
 patches:
   - target:

diff --git a/preferences/rhel/8_dpdk/kustomization.yaml b/preferences/rhel/8_dpdk/kustomization.yaml
@@ -7,7 +7,8 @@ resources:
 
 components:
   - ./metadata
-  - ../../components/cpu-topology-spread
+  - ./requirements
+  - ../../components/cpu-topology-sockets
   - ../../components/interface-multiqueue
 
 nameSuffix: ".dpdk"
diff --git a/preferences/rhel/8_dpdk/requirements/kustomization.yaml b/preferences/rhel/8_dpdk/requirements/kustomization.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./requirements.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./requirements.yaml
+    target:
+      kind: VirtualMachineClusterPreference
diff --git a/preferences/rhel/8_dpdk/requirements/requirements.yaml b/preferences/rhel/8_dpdk/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: 2
+    memory:
+      guest: 1.5Gi
diff --git a/preferences/rhel/9_dpdk/kustomization.yaml b/preferences/rhel/9_dpdk/kustomization.yaml
@@ -7,7 +7,8 @@ resources:
 
 components:
   - ./metadata
-  - ../../components/cpu-topology-spread
+  - ./requirements
+  - ../../components/cpu-topology-sockets
   - ../../components/interface-multiqueue
 
 nameSuffix: ".dpdk"
diff --git a/preferences/rhel/9_dpdk/requirements/kustomization.yaml b/preferences/rhel/9_dpdk/requirements/kustomization.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./requirements.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./requirements.yaml
+    target:
+      kind: VirtualMachineClusterPreference
diff --git a/preferences/rhel/9_dpdk/requirements/requirements.yaml b/preferences/rhel/9_dpdk/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: 2
+    memory:
+      guest: 1.5Gi