Skip to content

[OSDOCS-17084] Resolves third set of ADV errors for 17084#107490

Merged
stevsmit merged 1 commit intoopenshift:mainfrom
stevsmit:17084-osdocs-3
Mar 18, 2026
Merged

[OSDOCS-17084] Resolves third set of ADV errors for 17084#107490
stevsmit merged 1 commit intoopenshift:mainfrom
stevsmit:17084-osdocs-3

Conversation

@stevsmit
Copy link
Copy Markdown
Member

@stevsmit stevsmit commented Feb 26, 2026

Version(s):
4.16+

Issue:
https://issues.redhat.com/browse/OSDOCS-17084

Link to docs preview:
https://107490--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift-disable-lvms-csi-provider-csi-snapshot.html
https://107490--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift-gdp.html

QE review:

  • QE has approved this change.

Additional information:

About the cherry picks:

This PR has 8 files changed and the enterprise-4.19 branch one only has 1. This is becausethis PR did CQAs for the Generic Device Plugin feature for MicroShift. The Generic Device Plugin feature was not introduced until version 4.20. The feature PR can be found here: #97090

The "cherry pick" for 4.19 only adds the [role="_abstract"] to 1 file (microshift_configuring/microshift-disable-lvms-csi-provider-csi-snapshot.adoc) which exists in MicroShift versions 4.17-4.19; it does not exist in MicroShift version 4.16.

Just explaining the files changed discrepancy.

@ocpdocs-previewbot
Copy link
Copy Markdown

ocpdocs-previewbot commented Feb 26, 2026

Comment thread modules/microshift-proc-deploying-applications-with-generic-devices.adoc Outdated
@stevsmit stevsmit added the merge-review-needed Signifies that the merge review team needs to review this PR label Feb 26, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Feb 26, 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.

@stevsmit stevsmit changed the title Resolves third set of ADV errors for 17084 [OSDOCS-17084] Resolves third set of ADV errors for 17084 Mar 3, 2026
@kalexand-rh kalexand-rh removed the merge-review-needed Signifies that the merge review team needs to review this PR label Mar 4, 2026
@kalexand-rh
Copy link
Copy Markdown
Contributor

We are pausing reviews and merges of CQAs. Please put this back in the queue when we resume CQA merges.

@stevsmit stevsmit added the merge-review-needed Signifies that the merge review team needs to review this PR label Mar 17, 2026
@dfitzmau dfitzmau 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 Mar 18, 2026
Copy link
Copy Markdown
Contributor

@dfitzmau dfitzmau left a comment

Choose a reason for hiding this comment

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

Nice work. LGTM. Feel free to merge.

@dfitzmau dfitzmau removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Mar 18, 2026
@stevsmit stevsmit merged commit fe7215d into openshift:main Mar 18, 2026
2 checks passed
@stevsmit
Copy link
Copy Markdown
Member Author

/cherry-pick enterprise-4.22

@stevsmit
Copy link
Copy Markdown
Member Author

/cherry-pick enterprise-4.21

@stevsmit
Copy link
Copy Markdown
Member Author

/cherry-pick enterprise-4.20

@stevsmit
Copy link
Copy Markdown
Member Author

/cherry-pick enterprise-4.19

@stevsmit
Copy link
Copy Markdown
Member Author

/cherry-pick enterprise-4.18

@stevsmit
Copy link
Copy Markdown
Member Author

/cherry-pick enterprise-4.17

@stevsmit
Copy link
Copy Markdown
Member Author

/cherry-pick enterprise-4.16

@openshift-cherrypick-robot
Copy link
Copy Markdown

@stevsmit: new pull request created: #108651

Details

In response to this:

/cherry-pick enterprise-4.22

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

@stevsmit: #107490 failed to apply on top of branch "enterprise-4.20":

Applying: Resolves third set of ADV errors for 17084
.git/rebase-apply/patch:255: trailing whitespace.
The following entries explain common Generic Device Plugin configuration issues and how to resolve them. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	microshift_configuring/microshift-gdp.adoc
M	modules/microshift-proc-configuring-generic-device-plugin.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-proc-configuring-generic-device-plugin.adoc
CONFLICT (content): Merge conflict in modules/microshift-proc-configuring-generic-device-plugin.adoc
Auto-merging microshift_configuring/microshift-gdp.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 Resolves third set of ADV errors for 17084

Details

In response to this:

/cherry-pick enterprise-4.20

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

@stevsmit: #107490 failed to apply on top of branch "enterprise-4.21":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Details

In response to this:

/cherry-pick 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

@stevsmit: #107490 failed to apply on top of branch "enterprise-4.19":

Applying: Resolves third set of ADV errors for 17084
.git/rebase-apply/patch:255: trailing whitespace.
The following entries explain common Generic Device Plugin configuration issues and how to resolve them. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	microshift_configuring/microshift-gdp.adoc
A	modules/microshift-con-limitations-of-generic-device-plugin.adoc
A	modules/microshift-con-understanding-generic-device-plugin.adoc
A	modules/microshift-proc-configuring-generic-device-plugin.adoc
A	modules/microshift-proc-deploying-applications-with-generic-devices.adoc
A	modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc
A	modules/microshift-ref-generic-device-plugin-troubleshooting.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-ref-generic-device-plugin-troubleshooting.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-ref-generic-device-plugin-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-proc-deploying-applications-with-generic-devices.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-proc-deploying-applications-with-generic-devices.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-proc-configuring-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-proc-configuring-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-con-understanding-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-con-understanding-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-con-limitations-of-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-con-limitations-of-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): microshift_configuring/microshift-gdp.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of microshift_configuring/microshift-gdp.adoc left in tree.
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 Resolves third set of ADV errors for 17084

Details

In response to this:

/cherry-pick enterprise-4.19

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

@stevsmit: #107490 failed to apply on top of branch "enterprise-4.18":

Applying: Resolves third set of ADV errors for 17084
.git/rebase-apply/patch:255: trailing whitespace.
The following entries explain common Generic Device Plugin configuration issues and how to resolve them. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	microshift_configuring/microshift-gdp.adoc
A	modules/microshift-con-limitations-of-generic-device-plugin.adoc
A	modules/microshift-con-understanding-generic-device-plugin.adoc
A	modules/microshift-proc-configuring-generic-device-plugin.adoc
A	modules/microshift-proc-deploying-applications-with-generic-devices.adoc
A	modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc
A	modules/microshift-ref-generic-device-plugin-troubleshooting.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-ref-generic-device-plugin-troubleshooting.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-ref-generic-device-plugin-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-proc-deploying-applications-with-generic-devices.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-proc-deploying-applications-with-generic-devices.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-proc-configuring-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-proc-configuring-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-con-understanding-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-con-understanding-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-con-limitations-of-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-con-limitations-of-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): microshift_configuring/microshift-gdp.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of microshift_configuring/microshift-gdp.adoc left in tree.
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 Resolves third set of ADV errors for 17084

Details

In response to this:

/cherry-pick enterprise-4.18

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

@stevsmit: #107490 failed to apply on top of branch "enterprise-4.17":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Details

In response to this:

/cherry-pick enterprise-4.17

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

@stevsmit: #107490 failed to apply on top of branch "enterprise-4.16":

Applying: Resolves third set of ADV errors for 17084
.git/rebase-apply/patch:255: trailing whitespace.
The following entries explain common Generic Device Plugin configuration issues and how to resolve them. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	microshift_configuring/microshift-disable-lvms-csi-provider-csi-snapshot.adoc
A	microshift_configuring/microshift-gdp.adoc
A	modules/microshift-con-limitations-of-generic-device-plugin.adoc
A	modules/microshift-con-understanding-generic-device-plugin.adoc
A	modules/microshift-proc-configuring-generic-device-plugin.adoc
A	modules/microshift-proc-deploying-applications-with-generic-devices.adoc
A	modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc
A	modules/microshift-ref-generic-device-plugin-troubleshooting.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-ref-generic-device-plugin-troubleshooting.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-ref-generic-device-plugin-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-ref-generic-device-plugin-configuration-parameters.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-proc-deploying-applications-with-generic-devices.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-proc-deploying-applications-with-generic-devices.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-proc-configuring-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-proc-configuring-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-con-understanding-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-con-understanding-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-con-limitations-of-generic-device-plugin.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of modules/microshift-con-limitations-of-generic-device-plugin.adoc left in tree.
CONFLICT (modify/delete): microshift_configuring/microshift-gdp.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of microshift_configuring/microshift-gdp.adoc left in tree.
CONFLICT (modify/delete): microshift_configuring/microshift-disable-lvms-csi-provider-csi-snapshot.adoc deleted in HEAD and modified in Resolves third set of ADV errors for 17084. Version Resolves third set of ADV errors for 17084 of microshift_configuring/microshift-disable-lvms-csi-provider-csi-snapshot.adoc left in tree.
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 Resolves third set of ADV errors for 17084

Details

In response to this:

/cherry-pick 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

@stevsmit: new pull request could not be created: failed to create pull request against openshift/openshift-docs#enterprise-4.22 from head openshift-cherrypick-robot:cherry-pick-107490-to-enterprise-4.22: 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-107490-to-enterprise-4.22."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}

Details

In response to this:

/cherry-pick enterprise-4.22

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.

@stevsmit
Copy link
Copy Markdown
Member Author

/cherry-pick enterprise-4.21

@openshift-cherrypick-robot
Copy link
Copy Markdown

@stevsmit: new pull request created: #108652

Details

In response to this:

/cherry-pick 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.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants