Skip to content

Commit 43c5531

Browse files
author
Michael Burke
committed
Virtualization docs fixes during ROSA review 2
1 parent e98d1a5 commit 43c5531

19 files changed

+98
-66
lines changed

modules/oadp-creating-backup-hooks.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- <namespace> <1>
3030
excludedNamespaces: <2>
3131
- <namespace>
32-
includedResources: []
32+
includedResources:
3333
- pods <3>
3434
excludedResources: [] <4>
3535
labelSelector: <5>

modules/oadp-installing-dpa-1-2-and-earlier.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ endif::[]
345345
. Click *Create*.
346346

347347
[id="verifying-oadp-installation-1-2_{context}"]
348-
== Verifying the installation
348+
.Verification
349349

350350
. Verify the installation by viewing the {oadp-first} resources by running the following command:
351351
+
@@ -400,9 +400,9 @@ $ oc get dpa dpa-sample -n openshift-adp -o jsonpath='{.status}'
400400
----
401401
$ oc get backupStorageLocation -n openshift-adp
402402
----
403-
.Example output
404-
[source,yaml]
405403
+
404+
.Example output
405+
[source,terminal]
406406
----
407407
NAME PHASE LAST VALIDATED AGE DEFAULT
408408
dpa-sample-1 Available 1s 3d16h true

modules/oadp-installing-dpa-1-3.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,9 @@ endif::[]
359359

360360
. Click *Create*.
361361

362-
[id="verifying-oadp-installation-1-3_{context}"]
363-
== Verifying the installation
362+
.Verification
364363

365-
. . Verify the installation by viewing the {oadp-first} resources by running the following command:
364+
. Verify the installation by viewing the {oadp-first} resources by running the following command:
366365
+
367366
[source,terminal]
368367
----

modules/oadp-self-signed-certificate.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ kind: DataProtectionApplication
2323
metadata:
2424
name: <dpa_sample>
2525
spec:
26-
...
26+
# ...
2727
backupLocations:
2828
- name: default
2929
velero:
@@ -35,7 +35,7 @@ spec:
3535
caCert: <base64_encoded_cert_string> <1>
3636
config:
3737
insecureSkipTLSVerify: "false" <2>
38-
...
38+
# ...
3939
----
4040
<1> Specify the Base64-encoded CA certificate string.
4141
<2> The `insecureSkipTLSVerify` configuration can be set to either `"true"` or `"false"`. If set to `"true"`, SSL/TLS security is disabled. If set to `"false"`, SSL/TLS security is enabled.

modules/oadp-setting-resource-limits-and-requests.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: DataProtectionApplication
2424
metadata:
2525
name: <dpa_sample>
2626
spec:
27-
...
27+
# ...
2828
configuration:
2929
velero:
3030
podConfig:
@@ -45,4 +45,4 @@ spec:
4545
Kopia is an option in OADP 1.3 and later releases. You can use Kopia for file system backups, and Kopia is your only option for Data Mover cases with the built-in Data Mover.
4646
4747
Kopia is more resource intensive than Restic, and you might need to adjust the CPU and memory requirements accordingly.
48-
====
48+
====

modules/virt-adding-key-creating-vm-template.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ endif::[]
6565
The *VirtualMachine details* page displays the progress of the VM creation.
6666
6767
.Verification
68-
. Click the *Scripts* tab on the *Configuration* tab.
68+
* Click the *Scripts* tab on the *Configuration* tab.
6969
+
7070
The secret name is displayed in the *Authorized SSH key* section.
7171
@@ -74,4 +74,4 @@ ifeval::["{context}" == "static-key"]
7474
endif::[]
7575
ifeval::["{context}" == "dynamic-key"]
7676
:!dynamic-key:
77-
endif::[]
77+
endif::[]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ $ virtctl start vm example-vm
156156
----
157157

158158
.Verification
159-
. Get the VM configuration:
159+
* Get the VM configuration:
160160
+
161161
[source,terminal]
162162
----
@@ -194,4 +194,4 @@ ifeval::["{context}" == "static-key"]
194194
endif::[]
195195
ifeval::["{context}" == "dynamic-key"]
196196
:!dynamic-key:
197-
endif::[]
197+
endif::[]

modules/virt-creating-vm-snapshot-cli.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can create a virtual machine (VM) snapshot for an offline or online VM by cr
2020
+
2121
[source,yaml]
2222
----
23-
apiVersion: snapshot.kubevirt.io/v1beta1
23+
apiVersion: snapshot.kubevirt.io/v1alpha1
2424
kind: VirtualMachineSnapshot
2525
metadata:
2626
name: <snapshot_name>
@@ -76,7 +76,7 @@ $ oc describe vmsnapshot <snapshot_name>
7676
.Example output
7777
[source,yaml]
7878
----
79-
apiVersion: snapshot.kubevirt.io/v1beta1
79+
apiVersion: snapshot.kubevirt.io/v1alpha1
8080
kind: VirtualMachineSnapshot
8181
metadata:
8282
creationTimestamp: "2020-09-30T14:41:51Z"
@@ -86,7 +86,7 @@ metadata:
8686
name: mysnap
8787
namespace: default
8888
resourceVersion: "3897"
89-
selfLink: /apis/snapshot.kubevirt.io/v1beta1/namespaces/default/virtualmachinesnapshots/my-vmsnapshot
89+
selfLink: /apis/snapshot.kubevirt.io/v1alpha1/namespaces/default/virtualmachinesnapshots/my-vmsnapshot
9090
uid: 28eedf08-5d6a-42c1-969c-2eda58e2a78d
9191
spec:
9292
source:

modules/virt-define-guest-agent-ping-probe.adoc

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,23 @@ include::snippets/technology-preview.adoc[]
2424
.Sample guest agent ping probe
2525
[source,yaml]
2626
----
27+
apiVersion: kubevirt.io/v1
28+
kind: VirtualMachine
29+
metadata:
30+
annotations:
31+
name: fedora-vm
32+
namespace: example-namespace
2733
# ...
2834
spec:
29-
readinessProbe:
30-
guestAgentPing: {} <1>
31-
initialDelaySeconds: 120 <2>
32-
periodSeconds: 20 <3>
33-
timeoutSeconds: 10 <4>
34-
failureThreshold: 3 <5>
35-
successThreshold: 3 <6>
35+
template:
36+
spec:
37+
readinessProbe:
38+
guestAgentPing: {} <1>
39+
initialDelaySeconds: 120 <2>
40+
periodSeconds: 20 <3>
41+
timeoutSeconds: 10 <4>
42+
failureThreshold: 3 <5>
43+
successThreshold: 3 <6>
3644
# ...
3745
----
3846
<1> The guest agent ping probe to connect to the VM.

modules/virt-define-http-liveness-probe.adoc

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,26 @@ Define an HTTP liveness probe by setting the `spec.livenessProbe.httpGet` field
1818
.Sample liveness probe with an HTTP GET test
1919
[source,yaml]
2020
----
21+
apiVersion: kubevirt.io/v1
22+
kind: VirtualMachine
23+
metadata:
24+
annotations:
25+
name: fedora-vm
26+
namespace: example-namespace
2127
# ...
2228
spec:
23-
livenessProbe:
24-
initialDelaySeconds: 120 <1>
25-
periodSeconds: 20 <2>
26-
httpGet: <3>
27-
port: 1500 <4>
28-
path: /healthz <5>
29-
httpHeaders:
30-
- name: Custom-Header
31-
value: Awesome
32-
timeoutSeconds: 10 <6>
29+
template:
30+
spec:
31+
livenessProbe:
32+
initialDelaySeconds: 120 <1>
33+
periodSeconds: 20 <2>
34+
httpGet: <3>
35+
port: 1500 <4>
36+
path: /healthz <5>
37+
httpHeaders:
38+
- name: Custom-Header
39+
value: Awesome
40+
timeoutSeconds: 10 <6>
3341
# ...
3442
----
3543
<1> The time, in seconds, after the VM starts before the liveness probe is initiated.

0 commit comments

Comments
 (0)