Skip to content

Commit be9bd0b

Browse files
authored
Merge pull request #57755 from apinnick/general-cleanup
General cleanup
2 parents 1d37753 + 1e200d0 commit be9bd0b

9 files changed

+38
-66
lines changed

modules/virt-about-the-overview-dashboard.adoc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
//
33
// * web_console/using-dashboard-to-get-cluster-information.adoc
44

5-
ifeval::["{context}" == "virt-using-dashboard-to-get-cluster-info"]
6-
:virt-cluster:
7-
endif::[]
8-
95
:_content-type: CONCEPT
106
[id="virt-about-the-overview-dashboard_{context}"]
117
= About the {product-title} dashboards page
@@ -23,13 +19,7 @@ Status include *ok*, *error*, *warning*, *in progress*, and *unknown*. Resources
2319
** Number of nodes
2420
** Number of pods
2521
** Persistent storage volume claims
26-
ifdef::virt-cluster[]
27-
** Virtual machines (available if {VirtProductName} is installed)
28-
endif::virt-cluster[]
2922
** Bare metal hosts in the cluster, listed according to their state (only available in *metal3* environment).
30-
ifdef::virt-cluster[]
31-
* *Cluster Health* summarizes the current health of the cluster as a whole, including relevant alerts and descriptions. If {VirtProductName} is installed, the overall health of {VirtProductName} is diagnosed as well. If more than one subsystem is present, click *See All* to view the status of each subsystem.
32-
endif::virt-cluster[]
3323
* *Cluster Capacity* charts help administrators understand when additional resources are required in the cluster. The charts contain an inner ring that displays current consumption, while an outer ring displays thresholds configured for the resource, including information about:
3424
** CPU time
3525
** Memory allocation
@@ -39,6 +29,3 @@ endif::virt-cluster[]
3929
* *Events* lists messages related to recent activity in the cluster, such as pod creation or virtual machine migration to another host.
4030
* *Top Consumers* helps administrators understand how cluster resources are consumed. Click on a resource to jump to a detailed page listing pods and nodes that consume the largest amount of the specified cluster resource (CPU, memory, or storage).
4131
42-
ifeval::["{context}" == "virt-using-dashboard-to-get-cluster-info"]
43-
:!virt-cluster:
44-
endif::[]

modules/virt-about-vm-snapshots.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ With the VM snapshots feature, cluster administrators and application developers
2222
* Restore a VM from a snapshot
2323
* Delete an existing VM snapshot
2424
25+
[id="vm-snapshot-controller-and-crds_{context}"]
2526
== Virtual machine snapshot controller and custom resource definitions (CRDs)
2627

2728
The VM snapshot feature introduces three new API objects defined as CRDs for managing snapshots:

modules/virt-creating-blank-disk-datavolumes.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ customizing and deploying a data volume configuration file.
1818

1919
. Edit the `DataVolume` manifest:
2020
+
21-
2221
[source,yaml]
2322
----
2423
apiVersion: cdi.kubevirt.io/v1beta1
@@ -29,18 +28,17 @@ spec:
2928
source:
3029
blank: {}
3130
pvc:
32-
# Optional: Set the storage class or omit to accept the default
33-
# storageClassName: "hostpath"
31+
storageClassName: "hostpath" <1>
3432
accessModes:
3533
- ReadWriteOnce
3634
resources:
3735
requests:
3836
storage: 500Mi
3937
----
38+
<1> Optional: If you do not specify a storage class, the default storage class is applied.
4039

4140
. Create the blank disk image by running the following command:
4241
+
43-
4442
[source,terminal]
4543
----
4644
$ oc create -f <blank-image-datavolume>.yaml

modules/virt-creating-bridge-nad-web.adoc

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
[id="virt-creating-linux-bridge-nad-web_{context}"]
88
= Creating a Linux bridge network attachment definition in the web console
99

10-
Network administrators can create network attachment definitions to provide layer-2 networking to pods and virtual machines.
10+
You can create network attachment definitions to provide layer-2 networking to pods and virtual machines.
11+
12+
A Linux bridge network attachment definition is the most efficient method for connecting a virtual machine to a VLAN.
1113

1214
.Procedure
1315

14-
. In the web console, click *Networking* -> *Network Attachment Definitions*.
16+
. In the web console, click *Networking* -> *NetworkAttachmentDefinitions*.
1517
. Click *Create Network Attachment Definition*.
1618
+
1719
[NOTE]
@@ -20,13 +22,8 @@ The network attachment definition must be in the same namespace as the pod or vi
2022
====
2123
+
2224
. Enter a unique *Name* and optional *Description*.
23-
. Click the *Network Type* list and select *CNV Linux bridge*.
25+
. Select *CNV Linux bridge* from the *Network Type* list.
2426
. Enter the name of the bridge in the *Bridge Name* field.
2527
. Optional: If the resource has VLAN IDs configured, enter the ID numbers in the *VLAN Tag Number* field.
2628
. Optional: Select *MAC Spoof Check* to enable MAC spoof filtering. This feature provides security against a MAC spoofing attack by allowing only a single MAC address to exit the pod.
27-
. Click *Create*.
28-
+
29-
[NOTE]
30-
====
31-
A Linux bridge network attachment definition is the most efficient method for connecting a virtual machine to a VLAN.
32-
====
29+
. Click *Create*.

modules/virt-customizing-storage-profile.adoc

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@
99

1010
You can specify default parameters by editing the `StorageProfile` object for the provisioner's storage class. These default parameters only apply to the persistent volume claim (PVC) if they are not configured in the `DataVolume` object.
1111

12-
.Prerequisites
13-
* Ensure that your planned configuration is supported by the storage class and its provider. Specifying an incompatible configuration in a storage profile causes volume provisioning to fail.
14-
15-
[NOTE]
16-
====
1712
An empty `status` section in a storage profile indicates that a storage provisioner is not recognized by the Containerized Data Interface (CDI). Customizing a storage profile is necessary if you have a storage provisioner that is not recognized by the CDI. In this case, the administrator sets appropriate values in the storage profile to ensure successful allocations.
18-
====
1913

2014
[WARNING]
2115
====
2216
If you create a data volume and omit YAML attributes and these attributes are not defined in the storage profile, then the requested storage will not be allocated and the underlying persistent volume claim (PVC) will not be created.
2317
====
2418

19+
.Prerequisites
20+
21+
* Ensure that your planned configuration is supported by the storage class and its provider. Specifying an incompatible configuration in a storage profile causes volume provisioning to fail.
22+
2523
.Procedure
24+
2625
. Edit the storage profile. In this example, the provisioner is not recognized by CDI:
2726
+
2827
[source,terminal]
@@ -37,7 +36,7 @@ apiVersion: cdi.kubevirt.io/v1beta1
3736
kind: StorageProfile
3837
metadata:
3938
name: <unknown_provisioner_class>
40-
# ...
39+
...
4140
spec: {}
4241
status:
4342
provisioner: <unknown_provisioner>
@@ -53,7 +52,7 @@ apiVersion: cdi.kubevirt.io/v1beta1
5352
kind: StorageProfile
5453
metadata:
5554
name: <unknown_provisioner_class>
56-
# ...
55+
...
5756
spec:
5857
claimPropertySets:
5958
- accessModes:
@@ -76,9 +75,9 @@ You can use storage profiles to set a default cloning method for a storage class
7675

7776
Cloning strategies can be specified by setting the `cloneStrategy` attribute in a storage profile to one of these values:
7877

79-
* `snapshot` - This method is used by default when snapshots are configured. This cloning strategy uses a temporary volume snapshot to clone the volume. The storage provisioner must support CSI snapshots.
80-
* `copy` - This method uses a source pod and a target pod to copy data from the source volume to the target volume. Host-assisted cloning is the least efficient method of cloning.
81-
* `csi-clone` - This method uses the CSI clone API to efficiently clone an existing volume without using an interim volume snapshot. Unlike `snapshot` or `copy`, which are used by default if no storage profile is defined, CSI volume cloning is only used when you specify it in the `StorageProfile` object for the provisioner's storage class.
78+
* `snapshot` is used by default when snapshots are configured. This cloning strategy uses a temporary volume snapshot to clone the volume. The storage provisioner must support Container Storage Interface (CSI) snapshots.
79+
* `copy` uses a source pod and a target pod to copy data from the source volume to the target volume. Host-assisted cloning is the least efficient method of cloning.
80+
* `csi-clone` uses the CSI clone API to efficiently clone an existing volume without using an interim volume snapshot. Unlike `snapshot` or `copy`, which are used by default if no storage profile is defined, CSI volume cloning is only used when you specify it in the `StorageProfile` object for the provisioner's storage class.
8281

8382
[NOTE]
8483
====
@@ -92,19 +91,18 @@ apiVersion: cdi.kubevirt.io/v1beta1
9291
kind: StorageProfile
9392
metadata:
9493
name: <provisioner_class>
95-
# ...
94+
...
9695
spec:
9796
claimPropertySets:
9897
- accessModes:
9998
- ReadWriteOnce <1>
10099
volumeMode:
101100
Filesystem <2>
102-
cloneStrategy:
103-
csi-clone <3>
101+
cloneStrategy: csi-clone <3>
104102
status:
105103
provisioner: <provisioner>
106104
storageClass: <provisioner_class>
107105
----
108-
<1> The `accessModes` that you select.
109-
<2> The `volumeMode` that you select.
110-
<3> The default cloning method of your choice. In this example, CSI volume cloning is specified.
106+
<1> Specify the access mode.
107+
<2> Specify the volume mode.
108+
<3> Specify the default cloning strategy.

modules/virt-delete-vm-web.adoc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@
77

88
= Deleting a virtual machine using the web console
99

10-
Deleting a virtual machine permanently removes it from the cluster. +
11-
[NOTE]
12-
====
13-
When you delete a virtual machine, the data volume it uses is automatically deleted.
14-
====
10+
Deleting a virtual machine permanently removes it from the cluster.
1511

1612
.Procedure
1713

1814
. In the {product-title} console, click *Virtualization* -> *VirtualMachines* from the side menu.
1915

20-
. Click the Options menu {kebab} of the virtual machine that you want to delete and select *Delete*.
16+
. Click the Options menu {kebab} beside a virtual machine and select *Delete*.
17+
+
18+
Alternatively, click the virtual machine name to open the *VirtualMachine details* page and click *Actions* -> *Delete*.
2119

22-
** Alternatively, click the virtual machine name to open the *VirtualMachine details* page and click *Actions* -> *Delete*.
20+
. Optional: Select *With grace period* or clear *Delete disks*.
2321

24-
. In the confirmation pop-up window, click *Delete* to permanently delete the virtual machine.
22+
. Click *Delete* to permanently delete the virtual machine.

modules/virt-deleting-vms.adoc

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@
77

88
= Deleting a virtual machine by using the CLI
99

10-
You can delete a virtual machine by using the `oc` command line interface (CLI).
11-
The `oc` client enables you to perform actions on multiple virtual machines. +
12-
[NOTE]
13-
====
14-
When you delete a virtual machine, the data volume it uses is automatically deleted.
15-
====
10+
You can delete a virtual machine by using the `oc` command line interface (CLI). The `oc` client enables you to perform actions on multiple virtual machines.
1611

1712
.Prerequisites
1813

@@ -29,7 +24,7 @@ $ oc delete vm <vm_name>
2924
+
3025
[NOTE]
3126
====
32-
This command only deletes objects that exist in the current project. Specify the
33-
`-n <project_name>` option if the object you want to delete is in
27+
This command only deletes a VM in the current project. Specify the
28+
`-n <project_name>` option if the VM you want to delete is in
3429
a different project or namespace.
3530
====

modules/virt-enlarging-vm-disk.adoc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="virt-enlarging-vm-disk_{context}"]
77
= Enlarging a virtual machine disk
88

9-
VM disk enlargement makes extra space available to the virtual machine. However, it is the responsibility of the VM owner to decide how to consume the storage.
9+
Virtual machine (VM) disk enlargement makes extra space available to the virtual machine. However, it is the responsibility of the VM owner to decide how to consume the storage.
1010

1111
If the disk is a `Filesystem` PVC, the matching file expands to the remaining size while reserving some space for file system overhead.
1212

@@ -15,15 +15,13 @@ If the disk is a `Filesystem` PVC, the matching file expands to the remaining si
1515
. Edit the `PersistentVolumeClaim` manifest of the VM disk that you want to expand:
1616
+
1717
[source,terminal]
18-
1918
----
2019
$ oc edit pvc <pvc_name>
2120
----
2221

23-
. Change the value of `spec.resource.requests.storage` attribute to a larger size.
22+
. Update the disk size:
2423
+
2524
[source,yaml]
26-
2725
----
2826
apiVersion: v1
2927
kind: PersistentVolumeClaim
@@ -37,4 +35,4 @@ spec:
3735
storage: 3Gi <1>
3836
...
3937
----
40-
<1> The VM disk size that can be increased
38+
<1> Specify the new disk size.

modules/virt-example-nmstate-multiple-interfaces.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The following example snippet creates a bond that is named `bond10` across two N
1111

1212
[source,yaml]
1313
----
14-
#...
14+
...
1515
interfaces:
1616
- name: bond10
1717
description: Bonding eth2 and eth3 for Linux bridge
@@ -28,5 +28,5 @@ The following example snippet creates a bond that is named `bond10` across two N
2828
bridge:
2929
port:
3030
- name: bond10
31-
#...
31+
...
3232
----

0 commit comments

Comments
 (0)