Skip to content

[OSDOCS#18986] CQA pre-migration for Authentication index and Understanding identity provider assemblies#115739

Merged
maxwelldb merged 1 commit into
openshift:mainfrom
maxwelldb:osdocs-18986-authentication-index
Jul 21, 2026
Merged

[OSDOCS#18986] CQA pre-migration for Authentication index and Understanding identity provider assemblies#115739
maxwelldb merged 1 commit into
openshift:mainfrom
maxwelldb:osdocs-18986-authentication-index

Conversation

@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 17, 2026
@openshift-ci

openshift-ci Bot commented Jul 17, 2026

Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 17, 2026
@maxwelldb
maxwelldb force-pushed the osdocs-18986-authentication-index branch from c6011b6 to 669d3a3 Compare July 17, 2026 21:39
@maxwelldb

Copy link
Copy Markdown
Contributor Author

/test all

Comment thread modules/authentication-about-authentication.adoc Outdated
Comment thread modules/authentication-overview.adoc
Comment thread modules/authentication-overview.adoc
@maxwelldb
maxwelldb marked this pull request as ready for review July 18, 2026 23:22
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 18, 2026
Comment thread modules/authentication-overview.adoc
Comment thread modules/authentication-about-authentication.adoc Outdated
Comment thread modules/authentication-overview.adoc
Comment thread modules/authentication-overview.adoc
Comment thread modules/authentication-overview.adoc
Comment thread modules/authentication-overview.adoc
Comment thread modules/authentication-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/authorization-overview.adoc
Comment thread modules/supported-identity-providers.adoc
Comment thread modules/supported-identity-providers.adoc
Comment thread modules/supported-identity-providers.adoc
Comment thread modules/supported-identity-providers.adoc
Comment thread modules/supported-identity-providers.adoc

| xref:../authentication/understanding-authentication.adoc#understanding-authentication[Manage authentication]
| xref:../authentication/understanding-identity-provider.adoc#supported-identity-providers[Supported identity providers]
| xref:../authentication/understanding-identity-provider.adoc#supported-identity-providers_understanding-identity-provider[Supported identity providers]

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.ConceptLink: Move all links and cross references to Additional resources.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is just to keep the reference current. Resolving this error is out of scope for this PR.

@dfitzmau dfitzmau left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hi, @maxwelldb . Would you be OK to squash the commits?

Comment thread modules/authentication-overview.adoc
@dfitzmau dfitzmau removed the merge-review-needed Signifies that the merge review team needs to review this PR label Jul 20, 2026
@maxwelldb
maxwelldb force-pushed the osdocs-18986-authentication-index branch from e15a058 to 10d2152 Compare July 20, 2026 15:29
@maxwelldb
maxwelldb force-pushed the osdocs-18986-authentication-index branch from 10d2152 to b1ceba1 Compare July 21, 2026 11:17
@openshift-ci

openshift-ci Bot commented Jul 21, 2026

Copy link
Copy Markdown

@maxwelldb: 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.

@maxwelldb maxwelldb added the merge-review-needed Signifies that the merge review team needs to review this PR label Jul 21, 2026
@ShaunaDiaz ShaunaDiaz removed the merge-review-needed Signifies that the merge review team needs to review this PR label Jul 21, 2026
@maxwelldb

Copy link
Copy Markdown
Contributor Author

/cherry-pick enterprise-4.20
/cherry-pick enterprise-4.21
/cherry-pick enterprise-4.22
/cherry-pick enterprise-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@maxwelldb: once the present PR merges, I will cherry-pick it on top of enterprise-4.20, enterprise-4.21, enterprise-4.22, enterprise-5.0 in new PRs and assign them to you.

Details

In response to this:

/cherry-pick enterprise-4.20
/cherry-pick enterprise-4.21
/cherry-pick enterprise-4.22
/cherry-pick enterprise-5.0

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.

@maxwelldb
maxwelldb merged commit 5dabb9d into openshift:main Jul 21, 2026
2 checks passed
@openshift-cherrypick-robot

Copy link
Copy Markdown

@maxwelldb: #115739 failed to apply on top of branch "enterprise-4.20":

Applying: OSDOCS-18986: CQA pre-migration for Authentication and authorization index assembly
Using index info to reconstruct a base tree...
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.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 OSDOCS-18986: CQA pre-migration for Authentication and authorization index assembly

Details

In response to this:

/cherry-pick enterprise-4.20
/cherry-pick enterprise-4.21
/cherry-pick enterprise-4.22
/cherry-pick enterprise-5.0

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

@maxwelldb: #115739 failed to apply on top of branch "enterprise-4.21":

Applying: OSDOCS-18986: CQA pre-migration for Authentication and authorization index assembly
Using index info to reconstruct a base tree...
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.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 OSDOCS-18986: CQA pre-migration for Authentication and authorization index assembly

Details

In response to this:

/cherry-pick enterprise-4.20
/cherry-pick enterprise-4.21
/cherry-pick enterprise-4.22
/cherry-pick enterprise-5.0

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

@maxwelldb: #115739 failed to apply on top of branch "enterprise-4.22":

Applying: OSDOCS-18986: CQA pre-migration for Authentication and authorization index assembly
Using index info to reconstruct a base tree...
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.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 OSDOCS-18986: CQA pre-migration for Authentication and authorization index assembly

Details

In response to this:

/cherry-pick enterprise-4.20
/cherry-pick enterprise-4.21
/cherry-pick enterprise-4.22
/cherry-pick enterprise-5.0

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

@maxwelldb: #115739 failed to apply on top of branch "enterprise-5.0":

Applying: OSDOCS-18986: CQA pre-migration for Authentication and authorization index assembly
Using index info to reconstruct a base tree...
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.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 OSDOCS-18986: CQA pre-migration for Authentication and authorization index assembly

Details

In response to this:

/cherry-pick enterprise-4.20
/cherry-pick enterprise-4.21
/cherry-pick enterprise-4.22
/cherry-pick enterprise-5.0

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