From 67363744c12bc4700347c0415845fb097682005e Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Tue, 5 Nov 2024 12:54:38 +0000 Subject: [PATCH] Remove centos.7 and centos.stream8 Both sets of preferences were deprecated back with release v1.1.0 and can now be removed from the project. Signed-off-by: Lee Yarwood --- README.md | 5 ----- preferences/centos/7/kustomization.yaml | 13 ------------- preferences/centos/7/metadata/kustomization.yaml | 11 ----------- preferences/centos/7/metadata/metadata.yaml | 7 ------- .../centos/7/requirements/kustomization.yaml | 11 ----------- .../centos/7/requirements/requirements.yaml | 12 ------------ preferences/centos/7_desktop/kustomization.yaml | 11 ----------- preferences/centos/8_stream/kustomization.yaml | 13 ------------- .../centos/8_stream/metadata/kustomization.yaml | 11 ----------- preferences/centos/8_stream/metadata/metadata.yaml | 7 ------- .../8_stream/requirements/kustomization.yaml | 11 ----------- .../centos/8_stream/requirements/requirements.yaml | 12 ------------ .../centos/8_stream_desktop/kustomization.yaml | 11 ----------- .../centos/8_stream_dpdk/kustomization.yaml | 14 -------------- .../8_stream_dpdk/metadata/kustomization.yaml | 11 ----------- .../centos/8_stream_dpdk/metadata/metadata.yaml | 7 ------- .../8_stream_dpdk/requirements/kustomization.yaml | 11 ----------- .../8_stream_dpdk/requirements/requirements.yaml | 12 ------------ preferences/centos/kustomization.yaml | 5 ----- tests/functests/instancetype_test.go | 5 ----- 20 files changed, 200 deletions(-) delete mode 100644 preferences/centos/7/kustomization.yaml delete mode 100644 preferences/centos/7/metadata/kustomization.yaml delete mode 100644 preferences/centos/7/metadata/metadata.yaml delete mode 100644 preferences/centos/7/requirements/kustomization.yaml delete mode 100644 preferences/centos/7/requirements/requirements.yaml delete mode 100644 preferences/centos/7_desktop/kustomization.yaml delete mode 100644 preferences/centos/8_stream/kustomization.yaml delete mode 100644 preferences/centos/8_stream/metadata/kustomization.yaml delete mode 100644 preferences/centos/8_stream/metadata/metadata.yaml delete mode 100644 preferences/centos/8_stream/requirements/kustomization.yaml delete mode 100644 preferences/centos/8_stream/requirements/requirements.yaml delete mode 100644 preferences/centos/8_stream_desktop/kustomization.yaml delete mode 100644 preferences/centos/8_stream_dpdk/kustomization.yaml delete mode 100644 preferences/centos/8_stream_dpdk/metadata/kustomization.yaml delete mode 100644 preferences/centos/8_stream_dpdk/metadata/metadata.yaml delete mode 100644 preferences/centos/8_stream_dpdk/requirements/kustomization.yaml delete mode 100644 preferences/centos/8_stream_dpdk/requirements/requirements.yaml diff --git a/README.md b/README.md index 4cb4b43d..2a54f298 100644 --- a/README.md +++ b/README.md @@ -307,13 +307,8 @@ provided by this project: 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 centos.stream9 | CentOS Stream 9 centos.stream9.desktop | CentOS Stream 9 centos.stream9.dpdk | CentOS Stream 9 diff --git a/preferences/centos/7/kustomization.yaml b/preferences/centos/7/kustomization.yaml deleted file mode 100644 index 30db633d..00000000 --- a/preferences/centos/7/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../base - -components: - - ./metadata - - ./requirements - - ../../components/deprecated - -nameSuffix: ".7" diff --git a/preferences/centos/7/metadata/kustomization.yaml b/preferences/centos/7/metadata/kustomization.yaml deleted file mode 100644 index 9f42f6ec..00000000 --- a/preferences/centos/7/metadata/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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/7/metadata/metadata.yaml b/preferences/centos/7/metadata/metadata.yaml deleted file mode 100644 index dbe1c4fc..00000000 --- a/preferences/centos/7/metadata/metadata.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachinePreference -metadata: - name: metadata - annotations: - openshift.io/display-name: "CentOS 7" diff --git a/preferences/centos/7/requirements/kustomization.yaml b/preferences/centos/7/requirements/kustomization.yaml deleted file mode 100644 index 91dcc692..00000000 --- a/preferences/centos/7/requirements/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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/7/requirements/requirements.yaml b/preferences/centos/7/requirements/requirements.yaml deleted file mode 100644 index 2a3e9b75..00000000 --- a/preferences/centos/7/requirements/requirements.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -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/preferences/centos/7_desktop/kustomization.yaml b/preferences/centos/7_desktop/kustomization.yaml deleted file mode 100644 index cecc1a10..00000000 --- a/preferences/centos/7_desktop/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../7 - -components: - - ../../components/tablet-virtio - -nameSuffix: ".desktop" diff --git a/preferences/centos/8_stream/kustomization.yaml b/preferences/centos/8_stream/kustomization.yaml deleted file mode 100644 index 4dfd8ced..00000000 --- a/preferences/centos/8_stream/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../base - -components: - - ./metadata - - ./requirements - - ../../components/deprecated - -nameSuffix: ".stream8" diff --git a/preferences/centos/8_stream/metadata/kustomization.yaml b/preferences/centos/8_stream/metadata/kustomization.yaml deleted file mode 100644 index 9f42f6ec..00000000 --- a/preferences/centos/8_stream/metadata/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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/8_stream/metadata/metadata.yaml b/preferences/centos/8_stream/metadata/metadata.yaml deleted file mode 100644 index 4e787a27..00000000 --- a/preferences/centos/8_stream/metadata/metadata.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachinePreference -metadata: - name: metadata - annotations: - openshift.io/display-name: "CentOS Stream 8" diff --git a/preferences/centos/8_stream/requirements/kustomization.yaml b/preferences/centos/8_stream/requirements/kustomization.yaml deleted file mode 100644 index 91dcc692..00000000 --- a/preferences/centos/8_stream/requirements/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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/requirements/requirements.yaml b/preferences/centos/8_stream/requirements/requirements.yaml deleted file mode 100644 index 9e6c4a07..00000000 --- a/preferences/centos/8_stream/requirements/requirements.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -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/8_stream_desktop/kustomization.yaml b/preferences/centos/8_stream_desktop/kustomization.yaml deleted file mode 100644 index 8573f6e0..00000000 --- a/preferences/centos/8_stream_desktop/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../8_stream - -components: - - ../../components/tablet-virtio - -nameSuffix: ".desktop" diff --git a/preferences/centos/8_stream_dpdk/kustomization.yaml b/preferences/centos/8_stream_dpdk/kustomization.yaml deleted file mode 100644 index 0bac7dff..00000000 --- a/preferences/centos/8_stream_dpdk/kustomization.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../8_stream - -components: - - ./metadata - - ./requirements - - ../../components/cpu-topology-spread-4 - - ../../components/interface-multiqueue - -nameSuffix: ".dpdk" diff --git a/preferences/centos/8_stream_dpdk/metadata/kustomization.yaml b/preferences/centos/8_stream_dpdk/metadata/kustomization.yaml deleted file mode 100644 index 9f42f6ec..00000000 --- a/preferences/centos/8_stream_dpdk/metadata/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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/8_stream_dpdk/metadata/metadata.yaml b/preferences/centos/8_stream_dpdk/metadata/metadata.yaml deleted file mode 100644 index 34a1ee25..00000000 --- a/preferences/centos/8_stream_dpdk/metadata/metadata.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachinePreference -metadata: - name: metadata - annotations: - tags: "hidden,kubevirt,linux,centos-stream,dpdk" diff --git a/preferences/centos/8_stream_dpdk/requirements/kustomization.yaml b/preferences/centos/8_stream_dpdk/requirements/kustomization.yaml deleted file mode 100644 index 91dcc692..00000000 --- a/preferences/centos/8_stream_dpdk/requirements/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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 deleted file mode 100644 index 4de38f37..00000000 --- a/preferences/centos/8_stream_dpdk/requirements/requirements.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachinePreference -metadata: - name: requirements -spec: - requirements: - cpu: - # required as this preference uses SocketsCoresThreads with a ratio of 4, 1:4:2 == 8 vCPUs - guest: 8 - memory: - guest: 1.5Gi diff --git a/preferences/centos/kustomization.yaml b/preferences/centos/kustomization.yaml index 99f5968a..73328223 100644 --- a/preferences/centos/kustomization.yaml +++ b/preferences/centos/kustomization.yaml @@ -8,8 +8,3 @@ resources: - ./9_stream_desktop - ./9_stream_dpdk - ./9_stream - - ./8_stream_desktop - - ./8_stream_dpdk - - ./8_stream - - ./7_desktop - - ./7 diff --git a/tests/functests/instancetype_test.go b/tests/functests/instancetype_test.go index 5a07d891..568364c5 100644 --- a/tests/functests/instancetype_test.go +++ b/tests/functests/instancetype_test.go @@ -109,7 +109,6 @@ var _ = Describe("Common instance types func tests", func() { It("[test_id:10737] can be created when enough resources are provided", func() { preferenceInstancetypeMap := map[string]string{ - "centos.stream8.dpdk": "u1.2xlarge", "centos.stream9.dpdk": "u1.2xlarge", "rhel.8.dpdk": "u1.2xlarge", "rhel.9.dpdk": "u1.2xlarge", @@ -163,10 +162,6 @@ var _ = Describe("Common instance types func tests", func() { }, Entry("[test_id:10738] Fedora", fedoraContainerDisk, map[string]string{"amd64": "fedora", "arm64": "fedora.arm64"}, []testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("fedora")}), - Entry("[test_id:10740] CentOS 7", centos7ContainerDisk, map[string]string{"amd64": "centos.7"}, - []testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("centos")}), - Entry("[test_id:10744] CentOS Stream 8", centosStream8ContainerDisk, map[string]string{"amd64": "centos.stream8"}, - []testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("centos")}), Entry("[test_id:10745] CentOS Stream 9", centosStream9ContainerDisk, map[string]string{"amd64": "centos.stream9", "arm64": "centos.stream9"}, []testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}),