openshift / cluster-monitoring-operator

Manage the OpenShift monitoring stack
Apache License 2.0
247 stars 360 forks source link

[release-4.15] OCPBUGS-36312: inject trusted CA bundle into UWM Alertmanager #2400

Closed simonpasquier closed 2 months ago

simonpasquier commented 2 months ago

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

openshift-ci-robot commented 2 months ago

@simonpasquier: This pull request references Jira Issue OCPBUGS-36312, which is valid.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-34530](https://issues.redhat.com//browse/OCPBUGS-34530) is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-34530](https://issues.redhat.com//browse/OCPBUGS-34530) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @juzhao

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2400): >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 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci[bot] commented 2 months ago

@simonpasquier: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
juzhao commented 2 months ago

/label cherry-pick-approved /label qe-approved

simonpasquier commented 2 months ago

/label backport-risk-assessed

openshift-ci[bot] commented 2 months ago

[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

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/cluster-monitoring-operator/blob/release-4.15/OWNERS)~~ [simonpasquier,slashpai] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci-robot commented 2 months ago

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

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2400): >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 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
simonpasquier commented 2 months ago

/cherrypick release-4.14

openshift-cherrypick-robot commented 2 months ago

@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".
In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2400#issuecomment-2202257822): >/cherrypick release-4.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-bot commented 2 months ago

[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.