From b28b54afa2e033f5607176700df66583f1c02199 Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Tue, 6 Aug 2024 12:03:05 +0200 Subject: [PATCH 1/3] preferences: Add efi component Add efi component without secureboot. Signed-off-by: Felix Matouschek --- preferences/components/efi/efi.yaml | 9 +++++++++ preferences/components/efi/kustomization.yaml | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 preferences/components/efi/efi.yaml create mode 100644 preferences/components/efi/kustomization.yaml diff --git a/preferences/components/efi/efi.yaml b/preferences/components/efi/efi.yaml new file mode 100644 index 00000000..ea32c88f --- /dev/null +++ b/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 diff --git a/preferences/components/efi/kustomization.yaml b/preferences/components/efi/kustomization.yaml new file mode 100644 index 00000000..01908c89 --- /dev/null +++ b/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 From b50b43e668de58e7493581677e0c7a42cdff9086 Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Thu, 1 Aug 2024 12:44:24 +0200 Subject: [PATCH 2/3] feat: Add preferences for RHEL 10 Beta This adds preferences intended to be used with the RHEL 10 Beta. Signed-off-by: Felix Matouschek --- README.md | 2 ++ preferences/rhel/10/amd64/kustomization.yaml | 15 +++++++++++++++ .../rhel/10/amd64/metadata/kustomization.yaml | 11 +++++++++++ preferences/rhel/10/amd64/metadata/metadata.yaml | 9 +++++++++ .../rhel/10/amd64/requirements/kustomization.yaml | 11 +++++++++++ .../rhel/10/amd64/requirements/requirements.yaml | 12 ++++++++++++ preferences/rhel/10/arm64/kustomization.yaml | 14 ++++++++++++++ .../rhel/10/arm64/metadata/kustomization.yaml | 11 +++++++++++ preferences/rhel/10/arm64/metadata/metadata.yaml | 9 +++++++++ .../rhel/10/arm64/requirements/kustomization.yaml | 11 +++++++++++ .../rhel/10/arm64/requirements/requirements.yaml | 12 ++++++++++++ preferences/rhel/10/kustomization.yaml | 7 +++++++ preferences/rhel/kustomization.yaml | 1 + tests/functests/instancetype_test.go | 2 ++ tests/functests/test_suite_test.go | 4 ++++ 15 files changed, 131 insertions(+) create mode 100644 preferences/rhel/10/amd64/kustomization.yaml create mode 100644 preferences/rhel/10/amd64/metadata/kustomization.yaml create mode 100644 preferences/rhel/10/amd64/metadata/metadata.yaml create mode 100644 preferences/rhel/10/amd64/requirements/kustomization.yaml create mode 100644 preferences/rhel/10/amd64/requirements/requirements.yaml create mode 100644 preferences/rhel/10/arm64/kustomization.yaml create mode 100644 preferences/rhel/10/arm64/metadata/kustomization.yaml create mode 100644 preferences/rhel/10/arm64/metadata/metadata.yaml create mode 100644 preferences/rhel/10/arm64/requirements/kustomization.yaml create mode 100644 preferences/rhel/10/arm64/requirements/requirements.yaml create mode 100644 preferences/rhel/10/kustomization.yaml diff --git a/README.md b/README.md index 9fbb518f..3e8edb68 100644 --- a/README.md +++ b/README.md @@ -320,6 +320,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 diff --git a/preferences/rhel/10/amd64/kustomization.yaml b/preferences/rhel/10/amd64/kustomization.yaml new file mode 100644 index 00000000..f199cf6c --- /dev/null +++ b/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" diff --git a/preferences/rhel/10/amd64/metadata/kustomization.yaml b/preferences/rhel/10/amd64/metadata/kustomization.yaml new file mode 100644 index 00000000..9f42f6ec --- /dev/null +++ b/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 diff --git a/preferences/rhel/10/amd64/metadata/metadata.yaml b/preferences/rhel/10/amd64/metadata/metadata.yaml new file mode 100644 index 00000000..36112ff9 --- /dev/null +++ b/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" diff --git a/preferences/rhel/10/amd64/requirements/kustomization.yaml b/preferences/rhel/10/amd64/requirements/kustomization.yaml new file mode 100644 index 00000000..91dcc692 --- /dev/null +++ b/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 diff --git a/preferences/rhel/10/amd64/requirements/requirements.yaml b/preferences/rhel/10/amd64/requirements/requirements.yaml new file mode 100644 index 00000000..9e6c4a07 --- /dev/null +++ b/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 diff --git a/preferences/rhel/10/arm64/kustomization.yaml b/preferences/rhel/10/arm64/kustomization.yaml new file mode 100644 index 00000000..089b8cf6 --- /dev/null +++ b/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" diff --git a/preferences/rhel/10/arm64/metadata/kustomization.yaml b/preferences/rhel/10/arm64/metadata/kustomization.yaml new file mode 100644 index 00000000..9f42f6ec --- /dev/null +++ b/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 diff --git a/preferences/rhel/10/arm64/metadata/metadata.yaml b/preferences/rhel/10/arm64/metadata/metadata.yaml new file mode 100644 index 00000000..748c87f8 --- /dev/null +++ b/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" diff --git a/preferences/rhel/10/arm64/requirements/kustomization.yaml b/preferences/rhel/10/arm64/requirements/kustomization.yaml new file mode 100644 index 00000000..91dcc692 --- /dev/null +++ b/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 diff --git a/preferences/rhel/10/arm64/requirements/requirements.yaml b/preferences/rhel/10/arm64/requirements/requirements.yaml new file mode 100644 index 00000000..9e6c4a07 --- /dev/null +++ b/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 diff --git a/preferences/rhel/10/kustomization.yaml b/preferences/rhel/10/kustomization.yaml new file mode 100644 index 00000000..9f2a78eb --- /dev/null +++ b/preferences/rhel/10/kustomization.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ./arm64 + - ./amd64 diff --git a/preferences/rhel/kustomization.yaml b/preferences/rhel/kustomization.yaml index a53b2824..7d170959 100644 --- a/preferences/rhel/kustomization.yaml +++ b/preferences/rhel/kustomization.yaml @@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./10 - ./9_realtime - ./9_desktop - ./9_dpdk diff --git a/tests/functests/instancetype_test.go b/tests/functests/instancetype_test.go index 21cea0e2..18505937 100644 --- a/tests/functests/instancetype_test.go +++ b/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"}, diff --git a/tests/functests/test_suite_test.go b/tests/functests/test_suite_test.go index 10ec8ac5..2817916a 100644 --- a/tests/functests/test_suite_test.go +++ b/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", From 8d5bfb9975d4e29d5c30e4807f24235b2e9c6e27 Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Thu, 1 Aug 2024 12:47:05 +0200 Subject: [PATCH 3/3] feat: Add preferences for CentOS 10 Stream This adds preferences intended to be used with CentOS 10 Stream. Signed-off-by: Felix Matouschek --- README.md | 2 ++ preferences/centos/10_stream/kustomization.yaml | 14 ++++++++++++++ .../centos/10_stream/metadata/kustomization.yaml | 11 +++++++++++ .../centos/10_stream/metadata/metadata.yaml | 7 +++++++ .../10_stream/requirements/kustomization.yaml | 11 +++++++++++ .../10_stream/requirements/requirements.yaml | 12 ++++++++++++ .../centos/10_stream_desktop/kustomization.yaml | 11 +++++++++++ preferences/centos/kustomization.yaml | 2 ++ 8 files changed, 70 insertions(+) create mode 100644 preferences/centos/10_stream/kustomization.yaml create mode 100644 preferences/centos/10_stream/metadata/kustomization.yaml create mode 100644 preferences/centos/10_stream/metadata/metadata.yaml create mode 100644 preferences/centos/10_stream/requirements/kustomization.yaml create mode 100644 preferences/centos/10_stream/requirements/requirements.yaml create mode 100644 preferences/centos/10_stream_desktop/kustomization.yaml diff --git a/README.md b/README.md index 3e8edb68..4f3545d4 100644 --- a/README.md +++ b/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 diff --git a/preferences/centos/10_stream/kustomization.yaml b/preferences/centos/10_stream/kustomization.yaml new file mode 100644 index 00000000..6befea63 --- /dev/null +++ b/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" diff --git a/preferences/centos/10_stream/metadata/kustomization.yaml b/preferences/centos/10_stream/metadata/kustomization.yaml new file mode 100644 index 00000000..9f42f6ec --- /dev/null +++ b/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 diff --git a/preferences/centos/10_stream/metadata/metadata.yaml b/preferences/centos/10_stream/metadata/metadata.yaml new file mode 100644 index 00000000..3553bafc --- /dev/null +++ b/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" diff --git a/preferences/centos/10_stream/requirements/kustomization.yaml b/preferences/centos/10_stream/requirements/kustomization.yaml new file mode 100644 index 00000000..91dcc692 --- /dev/null +++ b/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 diff --git a/preferences/centos/10_stream/requirements/requirements.yaml b/preferences/centos/10_stream/requirements/requirements.yaml new file mode 100644 index 00000000..9e6c4a07 --- /dev/null +++ b/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 diff --git a/preferences/centos/10_stream_desktop/kustomization.yaml b/preferences/centos/10_stream_desktop/kustomization.yaml new file mode 100644 index 00000000..47ba0cf1 --- /dev/null +++ b/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" diff --git a/preferences/centos/kustomization.yaml b/preferences/centos/kustomization.yaml index f6e8b16f..99f5968a 100644 --- a/preferences/centos/kustomization.yaml +++ b/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