Skip to content

OSDOCS Adds oc describe instructions to viewing pods page#104958

Merged
bscott-rh merged 1 commit intoopenshift:mainfrom
stevsmit:ccs-6992
Jan 26, 2026
Merged

OSDOCS Adds oc describe instructions to viewing pods page#104958
bscott-rh merged 1 commit intoopenshift:mainfrom
stevsmit:ccs-6992

Conversation

@stevsmit
Copy link
Copy Markdown
Member

@stevsmit stevsmit commented Jan 19, 2026

I just want to go ahead and get the merge review out of the way so that I can merge it later. QE ack'd this in Slack but I think I'll ask her to look at the PR, too:

XiuJuan Wang
9:52 PM
hmm, yes, this looks good for me, oc describe is a good tool for debuging

Version(s):
4.16+

Issue:
https://104958--ocpdocs-pr.netlify.app/openshift-dedicated/latest/nodes/pods/nodes-pods-viewing.html

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 19, 2026
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 [error] AsciiDocDITA.ShortDescription: Assign [role="_abstract"] to a paragraph to use it as in DITA.

Copy link
Copy Markdown
Member Author

@stevsmit stevsmit Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to resolve this error because this isn't my content. I don't want the content owner to run the asciidoctor-dita-vale tool, it not return this error, and the way that I've re-written be erroneous. All of this content has to be checked for ADV errors, which I'm assuming the content owner will do after 4.21.

@openshift-ci openshift-ci Bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 19, 2026
@stevsmit stevsmit added this to the Continuous Release milestone Jan 19, 2026
@stevsmit stevsmit added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. merge-review-needed Signifies that the merge review team needs to review this PR labels Jan 19, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jan 19, 2026

@stevsmit: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@xiuwang
Copy link
Copy Markdown

xiuwang commented Jan 20, 2026

LGTM

@stevsmit stevsmit removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Jan 20, 2026
@stevsmit stevsmit changed the title Adds oc describe instructions to viewing pods page OSDOCS Adds oc describe instructions to viewing pods page Jan 26, 2026
@bscott-rh bscott-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Jan 26, 2026
Copy link
Copy Markdown
Contributor

@bscott-rh bscott-rh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge review LGTM.

@bscott-rh bscott-rh merged commit e4edd7e into openshift:main Jan 26, 2026
2 checks passed
@bscott-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: #104958 failed to apply on top of branch "enterprise-4.16":

Applying: Adds oc describe instructions to viewing pods page
Using index info to reconstruct a base tree...
A	modules/troubleshooting-general-describe-pod.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/telco-troubleshooting-general-describe-pod.adoc
CONFLICT (content): Merge conflict in modules/telco-troubleshooting-general-describe-pod.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Adds oc describe instructions to viewing pods page

Details

In response to this:

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@bscott-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.21

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: #104958 failed to apply on top of branch "enterprise-4.17":

Applying: Adds oc describe instructions to viewing pods page
Using index info to reconstruct a base tree...
A	modules/troubleshooting-general-describe-pod.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/telco-troubleshooting-general-describe-pod.adoc
CONFLICT (content): Merge conflict in modules/telco-troubleshooting-general-describe-pod.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Adds oc describe instructions to viewing pods page

Details

In response to this:

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #105364

Details

In response to this:

/cherrypick enterprise-4.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #105365

Details

In response to this:

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #105366

Details

In response to this:

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #105367

Details

In response to this:

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request could not be created: failed to create pull request against openshift/openshift-docs#enterprise-4.21 from head openshift-cherrypick-robot:cherry-pick-104958-to-enterprise-4.21: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-104958-to-enterprise-4.21."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}

Details

In response to this:

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants