From 5cf1f3d967fc7c3fbf36c3ca1aa415ad401b3e81 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 26 Sep 2023 10:37:00 +0200 Subject: [PATCH] preferences: Adjust display-name of windows virtio The display name "Microsoft Windows 11 (virtio)" and "Microsoft Windows Server 2019 (virtio)" containing the "virtio" is more consistent. Manualy cherry-pick of a5991ebc5cfc8814c783463dfab07543ba8b74df that is necessary due to ordering changes in the generated bundle files. CONFLICTS: common-clusterpreferences-bundle.yaml common-instancetypes-all-bundle.yaml common-preferences-bundle.yaml Co-authored-by: Felix Matouschek Signed-off-by: Dominik Holler --- common-clusterpreferences-bundle.yaml | 4 ++-- common-instancetypes-all-bundle.yaml | 8 ++++---- .../preferences/windows/11/metadata/metadata.yaml | 2 +- .../preferences/windows/2k19/metadata/metadata.yaml | 2 +- common-preferences-bundle.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml index 1b6bdda4..c281d3bd 100644 --- a/common-clusterpreferences-bundle.yaml +++ b/common-clusterpreferences-bundle.yaml @@ -548,7 +548,7 @@ kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows 11 + openshift.io/display-name: Microsoft Windows 11 (virtio) openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes openshift.io/provider-display-name: KubeVirt openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues @@ -886,7 +886,7 @@ kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows Server 2019 + openshift.io/display-name: Microsoft Windows Server 2019 (virtio) openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes openshift.io/provider-display-name: KubeVirt openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues diff --git a/common-instancetypes-all-bundle.yaml b/common-instancetypes-all-bundle.yaml index b9519a90..ab509116 100644 --- a/common-instancetypes-all-bundle.yaml +++ b/common-instancetypes-all-bundle.yaml @@ -1530,7 +1530,7 @@ kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows 11 + openshift.io/display-name: Microsoft Windows 11 (virtio) openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes openshift.io/provider-display-name: KubeVirt openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues @@ -1868,7 +1868,7 @@ kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows Server 2019 + openshift.io/display-name: Microsoft Windows Server 2019 (virtio) openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes openshift.io/provider-display-name: KubeVirt openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues @@ -3636,7 +3636,7 @@ kind: VirtualMachinePreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows 11 + openshift.io/display-name: Microsoft Windows 11 (virtio) openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes openshift.io/provider-display-name: KubeVirt openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues @@ -3974,7 +3974,7 @@ kind: VirtualMachinePreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows Server 2019 + openshift.io/display-name: Microsoft Windows Server 2019 (virtio) openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes openshift.io/provider-display-name: KubeVirt openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues diff --git a/common-instancetypes/preferences/windows/11/metadata/metadata.yaml b/common-instancetypes/preferences/windows/11/metadata/metadata.yaml index a304f38b..12b0c532 100644 --- a/common-instancetypes/preferences/windows/11/metadata/metadata.yaml +++ b/common-instancetypes/preferences/windows/11/metadata/metadata.yaml @@ -4,4 +4,4 @@ kind: VirtualMachinePreference metadata: name: metadata annotations: - openshift.io/display-name: "Microsoft Windows 11" + openshift.io/display-name: "Microsoft Windows 11 (virtio)" diff --git a/common-instancetypes/preferences/windows/2k19/metadata/metadata.yaml b/common-instancetypes/preferences/windows/2k19/metadata/metadata.yaml index 20d1e4ce..6e24fbb0 100644 --- a/common-instancetypes/preferences/windows/2k19/metadata/metadata.yaml +++ b/common-instancetypes/preferences/windows/2k19/metadata/metadata.yaml @@ -4,4 +4,4 @@ kind: VirtualMachinePreference metadata: name: metadata annotations: - openshift.io/display-name: "Microsoft Windows Server 2019" + openshift.io/display-name: "Microsoft Windows Server 2019 (virtio)" diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml index 7bc0c362..14692885 100644 --- a/common-preferences-bundle.yaml +++ b/common-preferences-bundle.yaml @@ -548,7 +548,7 @@ kind: VirtualMachinePreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows 11 + openshift.io/display-name: Microsoft Windows 11 (virtio) openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes openshift.io/provider-display-name: KubeVirt openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues @@ -886,7 +886,7 @@ kind: VirtualMachinePreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows Server 2019 + openshift.io/display-name: Microsoft Windows Server 2019 (virtio) openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes openshift.io/provider-display-name: KubeVirt openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues