Skip to content

Commit 23af3d8

Browse files
authored
Merge pull request #37886 from jboxman-rh/fix-yaml-errors
Fix YAML validation errors
2 parents feb510b + 2ec0de4 commit 23af3d8

20 files changed

+120
-128
lines changed

modules/builds-docker-credentials-private-registries.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ auths:
2424
auth: "YWRfbGzhcGU6R2labnRib21ifTE=" <2>
2525
email: "[email protected]" <3>
2626
https://docker.io/my-namespace/my-user/my-image: <4>
27-
auth: "GzhYWRGU6R2fbclabnRgbkSp=""
28-
27+
auth: "GzhYWRGU6R2fbclabnRgbkSp=""
28+
2929
https://docker.io/my-namespace: <5>
30-
auth: "GzhYWRGU6R2deesfrRgbkSp=""
31-
30+
auth: "GzhYWRGU6R2deesfrRgbkSp=""
31+
3232
----
3333
<1> URL of the registry.
3434
<2> Encrypted password.

modules/cnf-adjusting-nic-queues-with-the-performance-profile.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Unsupported network devices:
2626
* Access to the cluster as a user with the `cluster-admin` role.
2727
* Install the OpenShift CLI (`oc`).
2828

29-
3029
.Procedure
3130

3231
. Log in to the {product-title} cluster running the Performance Addon Operator as a user with `cluster-admin` privileges.
@@ -37,7 +36,7 @@ Unsupported network devices:
3736
+
3837
[source,terminal]
3938
----
40-
$ oc edit -f <your_profile_name>.yaml
39+
$ oc edit -f <your_profile_name>.yaml
4140
----
4241

4342
. Populate the `spec` field with the `net` object. The object list can contain two fields:
@@ -94,7 +93,7 @@ spec:
9493
- interfaceName: “eth1”
9594
- vendorID: “0x1af4”
9695
deviceID: “0x1000”
97-
nodeSelector:
96+
nodeSelector:
9897
node-role.kubernetes.io/worker-cnf: ""
9998
----
10099

@@ -164,5 +163,5 @@ spec:
164163
+
165164
[source,terminal]
166165
----
167-
$ oc apply -f <your_profile_name>.yaml
166+
$ oc apply -f <your_profile_name>.yaml
168167
----

modules/cnf-deploying-the-du-infrastructure-profile.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
. Create and apply the performance profile, for example:
1313
+
14-
[source,yaml]
14+
[source,terminal]
1515
----
1616
cat <<EOF | oc apply -f -
1717
apiVersion: performance.openshift.io/v1
@@ -60,9 +60,9 @@ $ oc wait mcp/worker-cnf --for condition="updated"
6060

6161
. Apply the PTP configuration, for example:
6262
+
63-
[source,yaml]
63+
[source,terminal]
6464
----
65-
cat <<EOF | oc apply -f -
65+
cat <<EOF | oc apply -f -
6666
apiVersion: ptp.openshift.io/v1
6767
kind: PtpConfig
6868
metadata:
@@ -196,7 +196,7 @@ This is currently set to match `logSyncInterval -4`.
196196

197197
. Apply the SR-IOV network node policy, for example:
198198
+
199-
[source,yaml]
199+
[source,terminal]
200200
----
201201
cat <<EOF | oc apply -f -
202202
apiVersion: sriovnetwork.openshift.io/v1
@@ -229,7 +229,7 @@ _SR-IOV configuration notes_.
229229

230230
. Create the SR-IOV network, for example:
231231
+
232-
[source,yaml]
232+
[source,terminal]
233233
----
234234
cat <<EOF | oc apply -f -
235235
apiVersion: sriovnetwork.openshift.io/v1

modules/cnf-installing-the-operators.adoc

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Install the Performance Addon Operator using the {product-title} CLI.
1515

1616
. Create the Performance Addon Operator namespace:
1717
+
18-
[source,yaml]
18+
[source,terminal]
1919
----
2020
cat <<EOF | oc apply -f -
2121
apiVersion: v1
@@ -33,7 +33,7 @@ EOF
3333

3434
. Apply the Operator group:
3535
+
36-
[source,yaml]
36+
[source,terminal]
3737
----
3838
cat <<EOF | oc apply -f -
3939
apiVersion: operators.coreos.com/v1
@@ -60,7 +60,7 @@ $ oc get packagemanifest performance-addon-operator -n openshift-marketplace -o
6060
. Apply the Subscription CR:
6161
+
6262
.Example subscription
63-
[source,yaml]
63+
[source,terminal]
6464
----
6565
cat <<EOF | oc apply -f -
6666
apiVersion: operators.coreos.com/v1alpha1
@@ -73,7 +73,6 @@ spec:
7373
name: performance-addon-operator
7474
source: redhat-operators <2>
7575
sourceNamespace: openshift-marketplace
76-
7776
EOF
7877
----
7978
<1> Specify the value you obtained in the previous step for the `status.defaultChannel` parameter.
@@ -88,7 +87,7 @@ Install the PTP Operator using the {product-title} CLI or the web console.
8887

8988
. Apply the Operator namespace:
9089
+
91-
[source,yaml]
90+
[source,terminal]
9291
----
9392
cat <<EOF | oc apply -f -
9493
apiVersion: v1
@@ -99,13 +98,12 @@ metadata:
9998
workload.openshift.io/allowed: management
10099
labels:
101100
openshift.io/cluster-monitoring: "true"
102-
103101
EOF
104102
----
105103

106104
. Apply the Operator group:
107105
+
108-
[source,yaml]
106+
[source,terminal]
109107
----
110108
cat <<EOF | oc apply -f -
111109
apiVersion: operators.coreos.com/v1
@@ -122,7 +120,7 @@ EOF
122120

123121
. Apply the subscription:
124122
+
125-
[source,yaml]
123+
[source,terminal]
126124
----
127125
cat <<EOF | oc apply -f -
128126
apiVersion: operators.coreos.com/v1alpha1
@@ -135,7 +133,6 @@ spec:
135133
name: ptp-operator
136134
source: "redhat-operators"
137135
sourceNamespace: openshift-marketplace
138-
139136
EOF
140137
----
141138

@@ -148,7 +145,7 @@ Load and enable the SCTP kernel module on worker nodes in your cluster.
148145

149146
. Apply the SCTP machine config patch:
150147
+
151-
[source,yaml]
148+
[source,terminal]
152149
----
153150
cat <<EOF | oc apply -f -
154151
apiVersion: machineconfiguration.openshift.io/v1
@@ -183,7 +180,7 @@ Install the SR-IOV Network Operator by using the {product-title} CLI or the web
183180

184181
. Apply the SR-IOV Operator namespace:
185182
+
186-
[source,yaml]
183+
[source,terminal]
187184
----
188185
cat <<EOF | oc apply -f -
189186
apiVersion: v1
@@ -192,13 +189,12 @@ metadata:
192189
name: openshift-sriov-network-operator
193190
annotations:
194191
workload.openshift.io/allowed: management
195-
196192
EOF
197193
----
198194

199195
. Apply the SR-IOV Operator group:
200196
+
201-
[source,yaml]
197+
[source,terminal]
202198
----
203199
cat <<EOF | oc apply -f -
204200
apiVersion: operators.coreos.com/v1
@@ -209,13 +205,12 @@ metadata:
209205
spec:
210206
targetNamespaces:
211207
- openshift-sriov-network-operator
212-
213208
EOF
214209
----
215210

216211
. Apply the SR-IOV Operator subscription:
217212
+
218-
[source,yaml]
213+
[source,terminal]
219214
----
220215
cat <<EOF | oc apply -f -
221216
apiVersion: operators.coreos.com/v1alpha1
@@ -228,7 +223,6 @@ spec:
228223
name: sriov-network-operator
229224
source: redhat-operators
230225
sourceNamespace: openshift-marketplace
231-
232226
EOF
233227
----
234228

modules/cnf-provisioning-deploying-a-distributed-unit-manually.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Before installing the Operators and deploying the DU, perform the following step
5656

5757
. Create a machine config pool for the RAN worker nodes. For example:
5858
+
59-
[source,yaml]
59+
[source,terminal]
6060
----
6161
cat <<EOF | oc apply -f -
6262
apiVersion: machineconfiguration.openshift.io/v1

modules/cnf-provisioning-real-time-and-low-latency-workloads.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ kind: Pod
223223
metadata:
224224
name: example
225225
spec:
226-
[...]
226+
# ...
227227
nodeSelector:
228-
node-role.kubernetes.io/worker-rt: ""
228+
node-role.kubernetes.io/worker-rt: ""
229229
----
230230

231231
For more information, see link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.5/html-single/nodes/index#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors].

modules/cnf-verifying-queue-status.adoc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ spec:
2323
spec:
2424
cpu:
2525
reserved: 0-1 #total = 2
26-
Isolated: 2-8
26+
isolated: 2-8
2727
net:
2828
userLevelNetworking: true
29-
...
29+
# ...
3030
----
3131

3232
* Display the status of the queues associated with a device using the following command:
@@ -102,15 +102,15 @@ metadata:
102102
name: performance
103103
spec:
104104
kind: PerformanceProfile
105-
spec:
106-
cpu:
105+
spec:
106+
cpu:
107107
reserved: 0-1 #total = 2
108-
Isolated: 2-8
109-
net:
108+
isolated: 2-8
109+
net:
110110
userLevelNetworking: true
111111
devices:
112112
- vendorID = 0x1af4
113-
...
113+
# ...
114114
----
115115

116116
* Display the status of the queues associated with a device using the following command:
@@ -164,7 +164,7 @@ The command `udevadm info` provides a detailed report on a device. In this examp
164164
E: ID_MODEL_ID=0x1000
165165
E: ID_VENDOR_ID=0x1af4
166166
E: INTERFACE=ens4
167-
167+
...
168168
----
169169

170170
[source,terminal]
@@ -187,14 +187,14 @@ metadata:
187187
spec:
188188
kind: PerformanceProfile
189189
spec:
190-
cpu:
191-
reserved: 0-1 #total = 2
192-
Isolated: 2-8
193-
net:
194-
userLevelNetworking: true
195-
devices:
196-
- interfaceName = eth0
197-
- vendorID = 0x1af4
190+
cpu:
191+
reserved: 0-1 #total = 2
192+
isolated: 2-8
193+
net:
194+
userLevelNetworking: true
195+
devices:
196+
- interfaceName = eth0
197+
- vendorID = 0x1af4
198198
...
199199
----
200200

modules/eco-configuring-machine-health-check-with-poison-pill.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
matchLabels:
5454
machine.openshift.io/cluster-api-machine-role: "worker"
5555
machine.openshift.io/cluster-api-machine-type: "worker"
56-
unhealthyConditions:
56+
unhealthyConditions:
5757
- type: "Ready"
5858
timeout: "300s"
5959
status: "False"

modules/ibm-z-ensure-high-disk-performance-hyperpav.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For z/VM-based {product-title} setups that use full-pack minidisks, you can leve
1818

1919
. Copy the following MCO sample profile into a YAML file for the control plane node. For example, `05-master-kernelarg-hpav.yaml`:
2020
+
21-
[source,yaml]
21+
[source,terminal]
2222
----
2323
$ cat 05-master-kernelarg-hpav.yaml
2424
apiVersion: machineconfiguration.openshift.io/v1
@@ -37,7 +37,7 @@ spec:
3737

3838
. Copy the following MCO sample profile into a YAML file for the compute node. For example, `05-worker-kernelarg-hpav.yaml`:
3939
+
40-
[source,yaml]
40+
[source,terminal]
4141
----
4242
$ cat 05-worker-kernelarg-hpav.yaml
4343
apiVersion: machineconfiguration.openshift.io/v1

0 commit comments

Comments
 (0)