Closed simonpasquier closed 2 months ago
@simonpasquier: This pull request references Jira Issue OCPBUGS-36312, which is valid.
Requesting review from QA contact: /cc @juzhao
The bug has been updated to refer to the pull request using the external bug tracker.
@simonpasquier: all tests passed!
Full PR test history. Your PR dashboard.
/label cherry-pick-approved /label qe-approved
/label backport-risk-assessed
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: simonpasquier, slashpai
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@simonpasquier: Jira Issue OCPBUGS-36312: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-36312 has been moved to the MODIFIED state.
/cherrypick release-4.14
@simonpasquier: #2400 failed to apply on top of branch "release-4.14":
Applying: OCPBUGS-34530: inject trusted CA bundle into UWM Alertmanager
Using index info to reconstruct a base tree...
M assets/alertmanager-user-workload/alertmanager.yaml
M jsonnet/components/alertmanager-user-workload.libsonnet
M pkg/manifests/manifests_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/manifests/manifests_test.go
Auto-merging jsonnet/components/alertmanager-user-workload.libsonnet
Auto-merging assets/alertmanager-user-workload/alertmanager.yaml
CONFLICT (content): Merge conflict in assets/alertmanager-user-workload/alertmanager.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-34530: inject trusted CA bundle into UWM Alertmanager
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".
[ART PR BUILD NOTIFIER]
This PR has been included in build cluster-monitoring-operator-container-v4.15.0-202407021107.p0.g2c84199.assembly.stream.el9 for distgit cluster-monitoring-operator. All builds following this will include this PR.
This is a manual cherry-pick of https://github.com/openshift/cluster-monitoring-operator/pull/2373.
Replaces https://github.com/openshift/cluster-monitoring-operator/pull/2399