Skip to content

Commit ae9136f

Browse files
authored
Merge pull request #69051 from mburke5678/virtualization-fix-errors
Virtualization docs fixes during ROSA review
2 parents 43af5ee + daac686 commit ae9136f

27 files changed

+117
-80
lines changed

modules/virt-adding-container-disk-as-cd.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ volumes:
4646
+
4747
[source,terminal]
4848
----
49-
$ virtctl start <vm>
49+
$ virtctl start <vm> -n <namespace>
5050
----
5151

5252
* If the VM is running, reboot the VM or run the following command:

modules/virt-adding-public-key-cli.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ $ oc create -f <manifest_file>.yaml
152152
+
153153
[source,terminal]
154154
----
155-
$ virtctl start vm example-vm
156-
----
155+
$ virtctl start vm example-vm -n example-namespace
156+
----
157157

158158
.Verification
159159
. Get the VM configuration:
@@ -187,6 +187,7 @@ endif::[]
187187
source:
188188
secret:
189189
secretName: authorized-keys
190+
# ...
190191
----
191192

192193
ifeval::["{context}" == "static-key"]

modules/virt-adding-vm-to-service-mesh.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ $ oc apply -f <vm_name>.yaml <1>
8383
+
8484
[source,yaml]
8585
----
86-
apiVersion: v1
87-
kind: Service
88-
metadata:
89-
name: vm-istio
90-
spec:
91-
selector:
92-
app: vm-istio <1>
93-
ports:
94-
- port: 8080
95-
name: http
96-
protocol: TCP
86+
apiVersion: v1
87+
kind: Service
88+
metadata:
89+
name: vm-istio
90+
spec:
91+
selector:
92+
app: vm-istio <1>
93+
ports:
94+
- port: 8080
95+
name: http
96+
protocol: TCP
9797
----
9898
<1> The service selector that determines the set of pods targeted by a service. This attribute corresponds to the `spec.metadata.labels` field in the VM configuration file. In the above example, the `Service` object named `vm-istio` targets TCP port 8080 on any pod with the label `app=vm-istio`.
9999

modules/virt-adding-vtpm-to-vm.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ TPM device. A vTPM device also stores secrets for that VM.
2020
+
2121
[source,terminal]
2222
----
23-
$ oc edit vm <vm_name>
23+
$ oc edit vm <vm_name> -n <namespace>
2424
----
2525

2626
. Edit the VM specification to add the vTPM device. For example:

modules/virt-configuring-storage-class-bootsource-update.adoc

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[id="virt-configuring-storage-class-bootsource-update_{context}"]
88
= Configuring a storage class for custom boot source updates
99

10-
Specify a new default storage class in the `HyperConverged` custom resource (CR).
10+
You can override the default storage class by editing the `HyperConverged` custom resource (CR).
1111

1212
[IMPORTANT]
1313
====
@@ -39,9 +39,20 @@ spec:
3939
template:
4040
spec:
4141
storageClassName: <new_storage_class> <1>
42-
#...
42+
schedule: "0 */12 * * *" <2>
43+
managedDataSource: <data_source> <3>
44+
# ...
4345
----
4446
<1> Define the storage class.
47+
<2> Required: Schedule for the job specified in cron format.
48+
<3> Required: The data source to use.
49+
+
50+
--
51+
[NOTE]
52+
----
53+
For the custom image to be detected as an available boot source, the value of the `spec.dataVolumeTemplates.spec.sourceRef.name` parameter in the VM template must match this value.
54+
----
55+
--
4556
4657
. Remove the `storageclass.kubernetes.io/is-default-class` annotation from the current default storage class.
4758
.. Retrieve the name of the current default storage class by running the following command:
@@ -54,10 +65,9 @@ $ oc get storageclass
5465
.Example output
5566
[source,text]
5667
----
57-
NAME PROVISIONER RECLAIMPOLICY VOLUMEBINDINGMODE ALLOWVOLUMEEXPANSION AGE
58-
csi-manila-ceph manila.csi.openstack.org Delete Immediate false 11d
59-
hostpath-csi-basic (default) kubevirt.io.hostpath-provisioner Delete WaitForFirstConsumer false 11d <1>
60-
...
68+
NAME PROVISIONER RECLAIMPOLICY VOLUMEBINDINGMODE ALLOWVOLUMEEXPANSION AGE
69+
csi-manila-ceph manila.csi.openstack.org Delete Immediate false 11d
70+
hostpath-csi-basic (default) kubevirt.io.hostpath-provisioner Delete WaitForFirstConsumer false 11d <1>
6171
----
6272
+
6373
<1> In this example, the current default storage class is named `hostpath-csi-basic`.
@@ -76,4 +86,4 @@ $ oc patch storageclass <current_default_storage_class> -p '{"metadata": {"annot
7686
----
7787
$ oc patch storageclass <new_storage_class> -p '{"metadata":{"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}' <1>
7888
----
79-
<1> Replace `<new_storage_class>` with the `storageClassName` value that you added to the `HyperConverged` CR.
89+
<1> Replace `<new_storage_class>` with the `storageClassName` value that you added to the `HyperConverged` CR.

modules/virt-connecting-secondary-network-ssh.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ You can connect to a virtual machine (VM) attached to a secondary network by usi
1919
+
2020
[source,terminal]
2121
----
22-
$ oc describe vm <vm_name>
22+
$ oc describe vm <vm_name> -n <namespace>
2323
----
2424
+
2525
.Example output

modules/virt-creating-linux-bridge-nad-cli.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ metadata:
3434
spec:
3535
config: '{
3636
"cniVersion": "0.3.1",
37-
"name": bridge-network, <3>
38-
"type": cnv-bridge, <4>
39-
"bridge": bridge-interface, <5>
37+
"name": "bridge-network", <3>
38+
"type": "cnv-bridge", <4>
39+
"bridge": "bridge-interface", <5>
4040
"macspoofchk": true, <6>
4141
"vlan": 100, <7>
4242
"preserveDefaultVlan": false <8>

modules/virt-creating-service-cli.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,15 @@ spec:
5555
selector:
5656
special: key <1>
5757
type: NodePort <2>
58+
ports: <3>
59+
protocol: TCP
60+
port: 80
61+
targetPort: 9376
62+
nodePort: 30000
5863
----
5964
<1> Specify the label that you added to the `spec.template.metadata.labels` stanza of the `VirtualMachine` manifest.
6065
<2> Specify `ClusterIP`, `NodePort`, or `LoadBalancer`.
66+
<3> Specifies a collection of network ports and protocols that you want to expose from the virtual machine.
6167

6268
. Save the `Service` manifest file.
6369
. Create the service by running the following command:

modules/virt-creating-vm-cli.adoc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
spec:
3333
sourceRef:
3434
kind: DataSource
35-
name: rhel9
35+
name: rhel9 <2>
3636
namespace: openshift-virtualization-os-images
3737
storage:
3838
resources:
@@ -82,12 +82,13 @@ spec:
8282
userData: |-
8383
#cloud-config
8484
user: cloud-user
85-
password: '<password>' <2>
85+
password: '<password>' <3>
8686
chpasswd: { expire: False }
8787
name: cloudinitdisk
8888
----
8989
<1> Specify the name of the virtual machine.
90-
<2> Specify the password for cloud-user.
90+
<2> Specify the name in the `spec.dataImportCronTemplate.spec.managedDataSource` field in the `Hyperconvered` CR.
91+
<3> Specify the password for cloud-user.
9192
====
9293

9394
. Create a virtual machine by using the manifest file:
@@ -101,5 +102,5 @@ $ oc create -f <vm_manifest_file>.yaml
101102
+
102103
[source,terminal]
103104
----
104-
$ virtctl start <vm_name>
105+
$ virtctl start <vm_name> -n <namespace>
105106
----

modules/virt-creating-vm-custom-image-web.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ ifdef::clone[]
6262
. Select the PVC project and the PVC name.
6363
endif::[]
6464
. Set the disk size.
65-
. Click *Customize VirtualMachine*.
65+
. Click *Next*.
6666
. Click *Create VirtualMachine*.
6767

6868
ifeval::["{context}" == "virt-creating-vms-from-web-images"]

0 commit comments

Comments
 (0)