Merge pull request #233 from kubevirt-bot/cherry-pick-219-to-release-1.1

[release-1.1] Add preferences for RHEL 10 Beta and CentOS 10 Stream

README.md

@@ -309,6 +309,8 @@ Name | Guest OS
 alpine | Alpine
 centos.7 | CentOS 7
 centos.7.desktop | CentOS 7
+centos.stream10 | CentOS Stream 10
+centos.stream10.desktop | CentOS Stream 10
 centos.stream8 | CentOS Stream 8
 centos.stream8.desktop | CentOS Stream 8
 centos.stream8.dpdk | CentOS Stream 8
@@ -320,6 +322,8 @@ fedora | Fedora (amd64)
 fedora.arm64 | Fedora (arm64)
 opensuse.leap | OpenSUSE Leap
 opensuse.tumbleweed | OpenSUSE Tumbleweed
+rhel.10 | Red Hat Enterprise Linux 10 Beta (amd64)
+rhel.10.arm64 | Red Hat Enterprise Linux 10 Beta (arm64)
 rhel.7 | Red Hat Enterprise Linux 7
 rhel.7.desktop | Red Hat Enterprise Linux 7
 rhel.8 | Red Hat Enterprise Linux 8

preferences/centos/10_stream/kustomization.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../base
+
+components:
+  - ./metadata
+  - ./requirements
+  - ../../components/rng
+  - ../../components/disk-dedicatediothread
+
+nameSuffix: ".stream10"

preferences/centos/10_stream/metadata/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./metadata.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./metadata.yaml
+    target:
+      kind: VirtualMachineClusterPreference

preferences/centos/10_stream/metadata/metadata.yaml

@@ -0,0 +1,7 @@
+---
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachinePreference
+metadata:
+  name: metadata
+  annotations:
+    openshift.io/display-name: "CentOS Stream 10"

preferences/centos/10_stream/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

preferences/centos/10_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

preferences/centos/10_stream_desktop/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../10_stream
+
+components:
+  - ../../components/tablet-virtio
+
+nameSuffix: ".desktop"

preferences/centos/kustomization.yaml

@@ -3,6 +3,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - ./10_stream_desktop
+  - ./10_stream
   - ./9_stream_desktop
   - ./9_stream_dpdk
   - ./9_stream

preferences/components/efi/efi.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachinePreference
+metadata:
+  name: efi
+spec:
+  firmware:
+    preferredUseEfi: true
+    preferredUseSecureBoot: false

preferences/components/efi/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./efi.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./efi.yaml
+    target:
+      kind: VirtualMachineClusterPreference

preferences/rhel/10/amd64/kustomization.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ./metadata
+  - ./requirements
+  - ../../../components/disk-dedicatediothread
+  - ../../../components/efi
+  - ../../../components/rng
+
+nameSuffix: ".10"

preferences/rhel/10/amd64/metadata/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./metadata.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./metadata.yaml
+    target:
+      kind: VirtualMachineClusterPreference

preferences/rhel/10/amd64/metadata/metadata.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachinePreference
+metadata:
+  name: metadata
+  annotations:
+    openshift.io/display-name: "Red Hat Enterprise Linux 10 Beta (amd64)"
+  labels:
+    instancetype.kubevirt.io/arch: "amd64"

preferences/rhel/10/amd64/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

preferences/rhel/10/amd64/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

preferences/rhel/10/arm64/kustomization.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ./metadata
+  - ./requirements
+  - ../../../components/disk-dedicatediothread
+  - ../../../components/rng
+
+nameSuffix: ".10.arm64"

preferences/rhel/10/arm64/metadata/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./metadata.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./metadata.yaml
+    target:
+      kind: VirtualMachineClusterPreference

preferences/rhel/10/arm64/metadata/metadata.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachinePreference
+metadata:
+  name: metadata
+  annotations:
+    openshift.io/display-name: "Red Hat Enterprise Linux 10 Beta (arm64)"
+  labels:
+    instancetype.kubevirt.io/arch: "arm64"

preferences/rhel/10/arm64/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

preferences/rhel/10/arm64/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

preferences/rhel/10/kustomization.yaml

@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ./arm64
+  - ./amd64

preferences/rhel/kustomization.yaml

@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - ./10
   - ./9_realtime
   - ./9_desktop
   - ./9_dpdk

tests/functests/instancetype_test.go

@@ -173,6 +173,8 @@ var _ = Describe("Common instance types func tests", func() {
 				[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}),
 			Entry("[test_id:TODO] RHEL 9", rhel9ContainerDisk, map[string]string{"amd64": "rhel.9", "arm64": "rhel.9.arm64"},
 				[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}),
+			Entry("[test_id:TODO] RHEL 10", rhel10ContainerDisk, map[string]string{"amd64": "rhel.10", "arm64": "rhel.10.arm64"},
+				[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}),
 			Entry("[test_id:10741] Ubuntu 18.04", ubuntu1804ContainerDisk, map[string]string{"amd64": "ubuntu"},
 				[]testFn{expectSSHToRunCommandOnLinux("ubuntu")}),
 			Entry("[test_id:10742] Ubuntu 20.04", ubuntu2004ContainerDisk, map[string]string{"amd64": "ubuntu", "arm64": "ubuntu"},

tests/functests/test_suite_test.go

@@ -27,6 +27,7 @@ const (
 	defaultCentosStream8ContainerDisk      = "quay.io/containerdisks/centos-stream:8"
 	defaultCentosStream9ContainerDisk      = "quay.io/containerdisks/centos-stream:9"
 	defaultRHEL9ContainerDisk              = "registry:5000/rhel-guest-image:9"
+	defaultRHEL10ContainerDisk             = "registry:5000/rhel-guest-image:10"
 	defaultUbuntu1804ContainerDisk         = "quay.io/containerdisks/ubuntu:18.04"
 	defaultUbuntu2004ContainerDisk         = "quay.io/containerdisks/ubuntu:20.04"
 	defaultUbuntu2204ContainerDisk         = "quay.io/containerdisks/ubuntu:22.04"
@@ -51,6 +52,7 @@ var (
 	centosStream8ContainerDisk      string
 	centosStream9ContainerDisk      string
 	rhel9ContainerDisk              string
+	rhel10ContainerDisk             string
 	ubuntu1804ContainerDisk         string
 	ubuntu2004ContainerDisk         string
 	ubuntu2204ContainerDisk         string
@@ -80,6 +82,8 @@ func init() {
 		defaultCentosStream9ContainerDisk, "CentOS Stream 9 container disk used by functional tests")
 	flag.StringVar(&rhel9ContainerDisk, "rhel-9-container-disk",
 		defaultRHEL9ContainerDisk, "RHEL 9 container disk used by functional tests")
+	flag.StringVar(&rhel10ContainerDisk, "rhel-10-container-disk",
+		defaultRHEL10ContainerDisk, "RHEL 10 container disk used by functional tests")
 	flag.StringVar(&ubuntu1804ContainerDisk, "ubuntu-1804-container-disk",
 		defaultUbuntu1804ContainerDisk, "Ubuntu 18.04 container disk used by functional tests")
 	flag.StringVar(&ubuntu2004ContainerDisk, "ubuntu-2004-container-disk",