Closed machine424 closed 1 month ago
@machine424: This pull request references Jira Issue OCPBUGS-38289, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
/jira refresh
@machine424: This pull request references Jira Issue OCPBUGS-38289, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @juzhao
otherwise lgtm!
I think this is ready now.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: machine424, simonpasquier
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest-required
/retest-required
Remaining retests: 0 against base HEAD 86aa090d6f63f02185fce79a6f1136848627ee4d and 2 for PR HEAD 55cbb5e9350dc86505012883da038871cd83e5e1 in total
@machine424: The following test failed, say /retest
to rerun all failed tests or /retest-required
to rerun all mandatory failed tests:
Test name | Commit | Details | Required | Rerun command |
---|---|---|---|---|
ci/prow/e2e-aws-ovn-single-node | 55cbb5e9350dc86505012883da038871cd83e5e1 | link | false | /test e2e-aws-ovn-single-node |
Full PR test history. Your PR dashboard.
/skip /retest-required
@machine424: Jira Issue OCPBUGS-38289: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-38289 has been moved to the MODIFIED state.
[ART PR BUILD NOTIFIER]
Distgit: cluster-monitoring-operator This PR has been included in build cluster-monitoring-operator-container-v4.18.0-202408221511.p0.g70ff2dc.assembly.stream.el9. All builds following this will include this PR.
/cherrypick release-4.17 release-4.16
@machine424: #2441 failed to apply on top of branch "release-4.17":
Applying: docs: clarify PrometheusK8sConfig.RemoteWrite.ProxyURL doc
Using index info to reconstruct a base tree...
M Documentation/api.md
Falling back to patching base and 3-way merge...
Auto-merging Documentation/api.md
CONFLICT (content): Merge conflict in Documentation/api.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 docs: clarify PrometheusK8sConfig.RemoteWrite.ProxyURL doc
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Also
docs: hide PrometheusK8sConfig.RemoteWrite.ProxyURL from docs until its usage is clarified