Skip to content

Commit 00e9707

Browse files
author
Michael Burke
committed
Support docs fixes during ROSA review
1 parent 9364192 commit 00e9707

21 files changed

+170
-56
lines changed

modules/cleaning-crio-storage.adoc

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * support/troubleshooting/troubleshooting-crio-issues
4+
15
:_content-type: PROCEDURE
26
[id="cleaning-crio-storage_{context}"]
37

@@ -23,7 +27,7 @@ can't stat lower layer ... because it does not exist. Going through storage to
2327

2428
* The container runtime implementation (`crio`) is not working properly.
2529

26-
* You are unable to start a debug shell on the node using `oc debug node/<nodename>` because the container runtime instance (`crio`) is not working.
30+
* You are unable to start a debug shell on the node using `oc debug node/<node_name>` because the container runtime instance (`crio`) is not working.
2731

2832
Follow this process to completely wipe the CRI-O storage and resolve the errors.
2933

@@ -38,19 +42,19 @@ Follow this process to completely wipe the CRI-O storage and resolve the errors.
3842
[source,terminal]
3943
+
4044
----
41-
$ oc adm cordon <nodename>
45+
$ oc adm cordon <node_name>
4246
----
4347
+
4448
. Drain the node as the cluster-admin user:
4549
[source,terminal]
4650
+
4751
----
48-
$ oc adm drain <nodename> --ignore-daemonsets --delete-emptydir-data
52+
$ oc adm drain <node_name> --ignore-daemonsets --delete-emptydir-data
4953
----
5054
+
5155
[NOTE]
5256
====
53-
The `terminationGracePeriodSeconds` attribute of a pod or pod template controls the graceful termination period. This attribute defaults at 30 seconds, but can be customized per application as necessary. If set to more than 90 seconds, the pod might be marked as `SIGKILLed` and fail to terminate successfully.
57+
The `terminationGracePeriodSeconds` attribute of a pod or pod template controls the graceful termination period. This attribute defaults at 30 seconds, but can be customized for each application as necessary. If set to more than 90 seconds, the pod might be marked as `SIGKILLed` and fail to terminate successfully.
5458
====
5559

5660
. When the node returns, connect back to the node via SSH or Console. Then connect to the root user:
@@ -125,7 +129,7 @@ ci-ln-tkbxyft-f76d1-nvwhr-master-1 Ready, SchedulingDisabled master 133m v
125129
[source,terminal]
126130
+
127131
----
128-
$ oc adm uncordon <nodename>
132+
$ oc adm uncordon <node_name>
129133
----
130134
+
131135
.Example output

modules/copying-files-pods-and-containers.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $ oc cp <local_path> <pod_name>:/<path> -c <container_name> <1>
3333
+
3434
[source,terminal]
3535
----
36-
$ oc cp <pod_name>:/<path> -c <container_name><local_path> <1>
36+
$ oc cp <pod_name>:/<path> -c <container_name> <local_path> <1>
3737
----
3838
<1> The first container in a pod is selected if the `-c` option is not specified.
3939
+

modules/gathering-data-audit-logs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $ tar cvaf must-gather.tar.gz must-gather.local.472290403699006248 <1>
4545
----
4646
<1> Replace `must-gather-local.472290403699006248` with the actual directory name.
4747

48-
. Attach the compressed file to your support case on the link:https://access.redhat.com[Red Hat Customer Portal].
48+
. Attach the compressed file to your support case on the link:https://access.redhat.com/support/cases/#/case/list[the *Customer Support* page] of the Red Hat Customer Portal.
4949
endif::openshift-origin[]
5050

5151
ifeval::["{context}" == "gathering-cluster-data"]

modules/gathering-data-network-logs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ $ tar cvaf must-gather.tar.gz must-gather.local.472290403699006248 <1>
2626
----
2727
<1> Replace `must-gather-local.472290403699006248` with the actual directory name.
2828

29-
. Attach the compressed file to your support case on the link:https://access.redhat.com[Red Hat Customer Portal].
29+
. Attach the compressed file to your support case on the link:https://access.redhat.com/support/cases/#/case/list[the *Customer Support* page] of the Red Hat Customer Portal.

modules/gathering-data-specific-features.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ $ tar cvaf must-gather.tar.gz must-gather.local.5421342344627712289/ <1>
365365
<1> Make sure to replace `must-gather-local.5421342344627712289/` with the
366366
actual directory name.
367367
368-
. Attach the compressed file to your support case on the link:https://access.redhat.com[Red Hat Customer Portal].
368+
. Attach the compressed file to your support case on the link:https://access.redhat.com/support/cases/#/case/list[the *Customer Support* page] of the Red Hat Customer Portal.
369369
endif::openshift-origin[]
370370
371371
ifeval::["{context}" == "gathering-cluster-data"]

modules/inspecting-pod-and-container-logs.adoc

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,25 @@ Logs retrieved using the preceding `oc logs` commands are composed of messages s
4242
+
4343
[source,terminal]
4444
----
45-
$ oc exec <pod_name> ls -alh /var/log
45+
$ oc exec <pod_name> -- ls -alh /var/log
46+
----
47+
+
48+
.Example output
49+
[source,text]
50+
----
51+
total 124K
52+
drwxr-xr-x. 1 root root 33 Aug 11 11:23 .
53+
drwxr-xr-x. 1 root root 28 Sep 6 2022 ..
54+
-rw-rw----. 1 root utmp 0 Jul 10 10:31 btmp
55+
-rw-r--r--. 1 root root 33K Jul 17 10:07 dnf.librepo.log
56+
-rw-r--r--. 1 root root 69K Jul 17 10:07 dnf.log
57+
-rw-r--r--. 1 root root 8.8K Jul 17 10:07 dnf.rpm.log
58+
-rw-r--r--. 1 root root 480 Jul 17 10:07 hawkey.log
59+
-rw-rw-r--. 1 root utmp 0 Jul 10 10:31 lastlog
60+
drwx------. 2 root root 23 Aug 11 11:14 openshift-apiserver
61+
drwx------. 2 root root 6 Jul 10 10:31 private
62+
drwxr-xr-x. 1 root root 22 Mar 9 08:05 rhsm
63+
-rw-rw-r--. 1 root utmp 0 Jul 10 10:31 wtmp
4664
----
4765
+
4866
.. Query a specific log file contained in `/var/log` within a pod:
@@ -51,6 +69,19 @@ $ oc exec <pod_name> ls -alh /var/log
5169
----
5270
$ oc exec <pod_name> cat /var/log/<path_to_log>
5371
----
72+
+
73+
.Example output
74+
[source,text]
75+
----
76+
2023-07-10T10:29:38+0000 INFO --- logging initialized ---
77+
2023-07-10T10:29:38+0000 DDEBUG timer: config: 13 ms
78+
2023-07-10T10:29:38+0000 DEBUG Loaded plugins: builddep, changelog, config-manager, copr, debug, debuginfo-install, download, generate_completion_cache, groups-manager, needs-restarting, playground, product-id, repoclosure, repodiff, repograph, repomanage, reposync, subscription-manager, uploadprofile
79+
2023-07-10T10:29:38+0000 INFO Updating Subscription Management repositories.
80+
2023-07-10T10:29:38+0000 INFO Unable to read consumer identity
81+
2023-07-10T10:29:38+0000 INFO Subscription Manager is operating in container mode.
82+
2023-07-10T10:29:38+0000 INFO
83+
----
84+
+
5485
.. List log files and subdirectories contained in `/var/log` within a specific container:
5586
+
5687
[source,terminal]

modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ $ oc -n ns1 get servicemonitor prometheus-example-monitor -o yaml
4848
+
4949
.Example output
5050
----
51+
apiVersion: v1
52+
kind: Service
53+
# ...
5154
spec:
5255
endpoints:
5356
- interval: 30s
@@ -56,6 +59,7 @@ spec:
5659
selector:
5760
matchLabels:
5861
app: prometheus-example-app
62+
# ...
5963
----
6064
+
6165
[NOTE]
@@ -124,6 +128,7 @@ data:
124128
config.yaml: |
125129
prometheusOperator:
126130
logLevel: debug
131+
# ...
127132
----
128133
+
129134
.. Save the file to apply the changes.

modules/olm-cs-status-cli.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@ $ oc describe catalogsource example-catalog -n {global_ns}
5858
----
5959
Name: example-catalog
6060
Namespace: {global_ns}
61-
...
61+
Labels: <none>
62+
Annotations: operatorframework.io/managed-by: marketplace-operator
63+
target.workload.openshift.io/management: {"effect": "PreferredDuringScheduling"}
64+
API Version: operators.coreos.com/v1alpha1
65+
Kind: CatalogSource
66+
# ...
6267
Status:
6368
Connection State:
6469
Address: example-catalog.{global_ns}.svc:50051
@@ -70,6 +75,7 @@ Status:
7075
Protocol: grpc
7176
Service Name: example-catalog
7277
Service Namespace: {global_ns}
78+
# ...
7379
----
7480
+
7581
In the preceding example output, the last observed state is `TRANSIENT_FAILURE`. This state indicates that there is a problem establishing a connection for the catalog source.

modules/olm-status-viewing-cli.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,20 @@ $ oc describe sub <subscription_name> -n <operator_namespace>
4040
.Example output
4141
[source,terminal]
4242
----
43+
Name: cluster-logging
44+
Namespace: openshift-logging
45+
Labels: operators.coreos.com/cluster-logging.openshift-logging=
46+
Annotations: <none>
47+
API Version: operators.coreos.com/v1alpha1
48+
Kind: Subscription
49+
# ...
4350
Conditions:
4451
Last Transition Time: 2019-07-29T13:42:57Z
4552
Message: all available catalogsources are healthy
4653
Reason: AllCatalogSourcesHealthy
4754
Status: False
4855
Type: CatalogSourcesUnhealthy
56+
# ...
4957
----
5058

5159
[NOTE]

modules/rosa-sts-ocm-role-creation.adoc

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,18 @@ This command allows you create the role by specifying specific attributes. The f
3838
I: Creating ocm role
3939
? Role prefix: ManagedOpenShift <1>
4040
? Enable admin capabilities for the OCM role (optional): No <2>
41-
? Permissions boundary ARN (optional): <3>
42-
? Role creation mode: auto <4>
41+
? Permissions boundary ARN (optional): <3>
42+
? Role Path (optional): <4>
43+
? Role creation mode: auto <5>
4344
I: Creating role using 'arn:aws:iam::<ARN>:user/<UserName>'
44-
? Create the 'ManagedOpenShift-OCM-Role-182' role? Yes <5>
45+
? Create the 'ManagedOpenShift-OCM-Role-182' role? Yes <6>
4546
I: Created role 'ManagedOpenShift-OCM-Role-182' with ARN 'arn:aws:iam::<ARN>:role/ManagedOpenShift-OCM-Role-182'
4647
I: Linking OCM role
47-
? OCM Role ARN: arn:aws:iam::<ARN>:role/ManagedOpenShift-OCM-Role-182 <6>
48-
? Link the 'arn:aws:iam::<ARN>:role/ManagedOpenShift-OCM-Role-182' role with organization '<AWS ARN'? Yes <7>
48+
? OCM Role ARN: arn:aws:iam::<ARN>:role/ManagedOpenShift-OCM-Role-182 <7>
49+
? Link the 'arn:aws:iam::<ARN>:role/ManagedOpenShift-OCM-Role-182' role with organization '<AWS ARN>'? Yes <8>
4950
I: Successfully linked role-arn 'arn:aws:iam::<ARN>:role/ManagedOpenShift-OCM-Role-182' with organization account '<AWS ARN>'
5051
----
52+
5153
<1> A prefix value for all of the created AWS resources. In this example, `ManagedOpenShift` prepends all of the AWS resources.
5254
<2> Choose if you want this role to have the additional admin permissions.
5355
+
@@ -57,7 +59,8 @@ You do not see this prompt if you used the `--admin` option.
5759
====
5860
+
5961
<3> The Amazon Resource Name (ARN) of the policy to set permission boundaries.
60-
<4> Choose the method of how to create your AWS roles. Using `auto`, the ROSA CLI generates and links the roles and policies. In the `auto` mode, you receive some different prompts to create the AWS roles.
61-
<5> The auto method asks if you want to create a specific `ocm-role` using your prefix.
62-
<6> Confirm that you want to associate your IAM role with your {cluster-manager}.
63-
<7> Links the created role with your AWS organization.
62+
<4> Specify an IAM path for the user name.
63+
<5> Choose the method to create your AWS roles. Using `auto`, the ROSA CLI generates and links the roles and policies. In the `auto` mode, you receive some different prompts to create the AWS roles.
64+
<6> The `auto` method asks if you want to create a specific `ocm-role` using your prefix.
65+
<7> Confirm that you want to associate your IAM role with your {cluster-manager}.
66+
<8> Links the created role with your AWS organization.

0 commit comments

Comments
 (0)