Skip to content

Commit

Permalink
preferences: Adjust display-name of windows virtio
Browse files Browse the repository at this point in the history
The display name "Microsoft Windows 11 (virtio)" and
"Microsoft Windows Server 2019 (virtio)" containing the
"virtio" is more consistent.

Manualy cherry-pick of a5991eb
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 <[email protected]>
Signed-off-by: Dominik Holler <[email protected]>
  • Loading branch information
dominikholler and 0xFelix committed Nov 13, 2023
1 parent db0a97c commit 5cf1f3d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions common-clusterpreferences-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions common-instancetypes-all-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
4 changes: 2 additions & 2 deletions common-preferences-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5cf1f3d

Please sign in to comment.