Skip to content

OSDOCS-18670 Fixes for MS security, auth, and node access CQA#108456

Merged
JoeAldinger merged 1 commit intoopenshift:mainfrom
cbippley:OSDOCS-18670
Mar 17, 2026
Merged

OSDOCS-18670 Fixes for MS security, auth, and node access CQA#108456
JoeAldinger merged 1 commit intoopenshift:mainfrom
cbippley:OSDOCS-18670

Conversation

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 17, 2026
@openshift-ci
Copy link

openshift-ci bot commented Mar 17, 2026

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

Copy link
Contributor

@JoeAldinger JoeAldinger left a comment

Choose a reason for hiding this comment

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

/lgtm combining the two works.

@JoeAldinger JoeAldinger added merge-review-in-progress Signifies that the merge review team is reviewing this PR ok-to-merge labels Mar 17, 2026
@cbippley
Copy link
Contributor Author

/merge-review-needed

@JoeAldinger JoeAldinger merged commit 2c0fce7 into openshift:main Mar 17, 2026
2 checks passed
@JoeAldinger
Copy link
Contributor

/cherrypick enterprise-4.16

@JoeAldinger
Copy link
Contributor

/cherrypick enterprise-4.17

@JoeAldinger
Copy link
Contributor

/cherrypick enterprise-4.18

@JoeAldinger
Copy link
Contributor

/cherrypick enterprise-4.19

@JoeAldinger
Copy link
Contributor

/cherrypick enterprise-4.20

@JoeAldinger
Copy link
Contributor

/cherrypick enterprise-4.21

@JoeAldinger
Copy link
Contributor

/cherrypick enterprise-4.22

@openshift-cherrypick-robot

@JoeAldinger: #108456 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-18670 Fixes for MS security, auth, and node access CQA
Using index info to reconstruct a base tree...
M	microshift_configuring/microshift_auth_security/microshift-audit-logs-config.adoc
M	modules/microshift-audit-logs-config-proc.adoc
M	modules/microshift-custom-ca-proc.adoc
A	modules/microshift-tls-config-proc.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-tls-config-proc.adoc deleted in HEAD and modified in OSDOCS-18670 Fixes for MS security, auth, and node access CQA. Version OSDOCS-18670 Fixes for MS security, auth, and node access CQA of modules/microshift-tls-config-proc.adoc left in tree.
Auto-merging modules/microshift-custom-ca-proc.adoc
Auto-merging modules/microshift-audit-logs-config-proc.adoc
Auto-merging microshift_configuring/microshift_auth_security/microshift-audit-logs-config.adoc
CONFLICT (content): Merge conflict in microshift_configuring/microshift_auth_security/microshift-audit-logs-config.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-18670 Fixes for MS security, auth, and node access CQA

Details

In response to this:

/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

@JoeAldinger: #108456 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-18670 Fixes for MS security, auth, and node access CQA
Using index info to reconstruct a base tree...
M	microshift_configuring/microshift_auth_security/microshift-audit-logs-config.adoc
M	modules/microshift-custom-ca-proc.adoc
A	modules/microshift-tls-config-proc.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-tls-config-proc.adoc deleted in HEAD and modified in OSDOCS-18670 Fixes for MS security, auth, and node access CQA. Version OSDOCS-18670 Fixes for MS security, auth, and node access CQA of modules/microshift-tls-config-proc.adoc left in tree.
Auto-merging modules/microshift-custom-ca-proc.adoc
Auto-merging microshift_configuring/microshift_auth_security/microshift-audit-logs-config.adoc
CONFLICT (content): Merge conflict in microshift_configuring/microshift_auth_security/microshift-audit-logs-config.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-18670 Fixes for MS security, auth, and node access CQA

Details

In response to this:

/cherrypick 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

@JoeAldinger: #108456 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-18670 Fixes for MS security, auth, and node access CQA
Using index info to reconstruct a base tree...
M	microshift_configuring/microshift_auth_security/microshift-audit-logs-config.adoc
M	modules/microshift-custom-ca-proc.adoc
A	modules/microshift-tls-config-proc.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-tls-config-proc.adoc deleted in HEAD and modified in OSDOCS-18670 Fixes for MS security, auth, and node access CQA. Version OSDOCS-18670 Fixes for MS security, auth, and node access CQA of modules/microshift-tls-config-proc.adoc left in tree.
Auto-merging modules/microshift-custom-ca-proc.adoc
Auto-merging microshift_configuring/microshift_auth_security/microshift-audit-logs-config.adoc
CONFLICT (content): Merge conflict in microshift_configuring/microshift_auth_security/microshift-audit-logs-config.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-18670 Fixes for MS security, auth, and node access CQA

Details

In response to this:

/cherrypick 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

@JoeAldinger: new pull request created: #108463

Details

In response to this:

/cherrypick 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

@JoeAldinger: new pull request created: #108464

Details

In response to this:

/cherrypick 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

@JoeAldinger: new pull request created: #108465

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

@JoeAldinger: new pull request created: #108466

Details

In response to this:

/cherrypick 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.

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.

4 participants