Skip to content

Conversation

@ShaunaDiaz
Copy link
Contributor

@ShaunaDiaz ShaunaDiaz commented Aug 12, 2025

Version(s):
4.19+

Issue:
OSDOCS-15307

Link to docs preview:
microshift-ingress-control-config

QE review:

  • QE has approved this change.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 12, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 12, 2025

@ShaunaDiaz: This pull request references OSDOCS-15307 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s):
4.19+

Issue:
OSDOCS-15307

Link to docs preview:

QE review:

  • QE has approved this change.

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 openshift-eng/jira-lifecycle-plugin repository.

@ShaunaDiaz ShaunaDiaz added this to the Continuous Release milestone Aug 12, 2025
@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 12, 2025
@ocpdocs-previewbot
Copy link

🤖 Tue Aug 12 11:54:48 - Prow CI generated the docs preview:

https://97430--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift-ingress-controller.html

@openshift-ci
Copy link

openshift-ci bot commented Aug 12, 2025

@ShaunaDiaz: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 12, 2025

@ShaunaDiaz: This pull request references OSDOCS-15307 which is a valid jira issue.

In response to this:

Version(s):
4.19+

Issue:
OSDOCS-15307

Link to docs preview:
microshift-ingress-control-config

QE review:

  • QE has approved this change.

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link

@pacevedom pacevedom left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 13, 2025
@agullon
Copy link

agullon commented Aug 14, 2025

/lgtm form QE

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 14, 2025

@ShaunaDiaz: This pull request references OSDOCS-15307 which is a valid jira issue.

In response to this:

Version(s):
4.19+

Issue:
OSDOCS-15307

Link to docs preview:
microshift-ingress-control-config

QE review:

  • QE has approved this change.

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 openshift-eng/jira-lifecycle-plugin repository.

@ShaunaDiaz ShaunaDiaz added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 14, 2025
@xenolinux xenolinux 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 Aug 14, 2025
@xenolinux xenolinux changed the title OSDOCS-15307: adds file name for CA bundle to ingress MicroShift OSDOCS#15307: adds file name for CA bundle to ingress MicroShift Aug 14, 2025
@openshift-ci-robot openshift-ci-robot removed the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 14, 2025
@openshift-ci-robot
Copy link

@ShaunaDiaz: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

Version(s):
4.19+

Issue:
OSDOCS-15307

Link to docs preview:
microshift-ingress-control-config

QE review:

  • QE has approved this change.

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

Looks great!

Merging

@xenolinux xenolinux merged commit 3193b2f into openshift:main Aug 14, 2025
2 checks passed
@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.19

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.20

@xenolinux xenolinux removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 14, 2025
@openshift-cherrypick-robot

@xenolinux: #97430 failed to apply on top of branch "enterprise-4.19":

Applying: OSDOCS-15307: adds file name for CA bundle to ingress MicroShift
Using index info to reconstruct a base tree...
M	modules/microshift-ingress-controller-config.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-ingress-controller-config.adoc
CONFLICT (content): Merge conflict in modules/microshift-ingress-controller-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 advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15307: adds file name for CA bundle to ingress MicroShift

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

@xenolinux: new pull request created: #97596

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.

@xenolinux
Copy link
Contributor

xenolinux commented Aug 14, 2025

@xenolinux: #97430 failed to apply on top of branch "enterprise-4.19":

Applying: [OSDOCS-15307](https://issues.redhat.com//browse/OSDOCS-15307): adds file name for CA bundle to ingress MicroShift
Using index info to reconstruct a base tree...
M	modules/microshift-ingress-controller-config.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-ingress-controller-config.adoc
CONFLICT (content): Merge conflict in modules/microshift-ingress-controller-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 advice.mergeConflict false"
Patch failed at 0001 [OSDOCS-15307](https://issues.redhat.com//browse/OSDOCS-15307): adds file name for CA bundle to ingress MicroShift

@ShaunaDiaz conflicts! need a manual CP PR :(

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

Labels

branch/enterprise-4.19 branch/enterprise-4.20 lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants