openshift / cluster-monitoring-operator

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

OCPBUGS-33645: inject trusted CA bundle into UWM Alertmanager #2349

Closed simonpasquier closed 4 months ago

simonpasquier commented 5 months ago
openshift-ci-robot commented 5 months ago

@simonpasquier: This pull request references Jira Issue OCPBUGS-33645, 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.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2349): > > >* [ ] I added CHANGELOG entry for this change. >* [ ] No user facing changes, so no entry in CHANGELOG was needed. > 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 5 months ago

/hold

simonpasquier commented 5 months ago

/jira refresh

openshift-ci-robot commented 5 months ago

@simonpasquier: This pull request references Jira Issue OCPBUGS-33645, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.16.0) matches configured target version for branch (4.16.0) * bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @juzhao

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2349#issuecomment-2115218379): >/jira refresh 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 5 months ago

/hold cancel

juzhao commented 5 months ago

/retest

simonpasquier commented 5 months ago

/jira refresh

openshift-ci-robot commented 5 months ago

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

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.16.0) matches configured target version for branch (4.16.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @juzhao

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2349#issuecomment-2117603320): >/jira refresh 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-robot commented 5 months ago

@simonpasquier: This pull request references Jira Issue OCPBUGS-33645, 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.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2349): > > >* [ ] I added CHANGELOG entry for this change. >* [ ] No user facing changes, so no entry in CHANGELOG was needed. > 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.
juzhao commented 5 months ago

/retest

juzhao commented 5 months ago

updated "Target Version"to 4.17.0, updated "Target Backport Versions" to 4.15.z, 4.16.0 /jira refresh

openshift-ci-robot commented 5 months ago

@juzhao: This pull request references Jira Issue OCPBUGS-33645, which is valid.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.17.0) matches configured target version for branch (4.17.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @juzhao

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2349#issuecomment-2119503833): >updated "Target Version"to 4.17.0, updated "Target Backport Versions" to 4.15.z, 4.16.0 >/jira refresh 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.
juzhao commented 5 months ago

/test e2e-aws-ovn-single-node

openshift-ci[bot] commented 4 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marioferh, simonpasquier

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/master/OWNERS)~~ [marioferh,simonpasquier] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
jan--f commented 4 months ago

/retest

openshift-ci-robot commented 4 months ago

/retest-required

Remaining retests: 0 against base HEAD ed7ec0a88eee4909ec60db086c0da7e82140de5f and 2 for PR HEAD f264fb168198e0cae8dc476f3e8e6a0b1c5098c4 in total

simonpasquier commented 4 months ago

/retest-required

openshift-ci[bot] commented 4 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).
openshift-ci-robot commented 4 months ago

@simonpasquier: Jira Issue OCPBUGS-33645: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-33645 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2349): > > >* [ ] I added CHANGELOG entry for this change. >* [x] No user facing changes, so no entry in CHANGELOG was needed. > 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-bot commented 4 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-monitoring-operator-container-v4.17.0-202405272212.p0.g640c7c4.assembly.stream.el9 for distgit cluster-monitoring-operator. All builds following this will include this PR.

simonpasquier commented 4 months ago

/cherry-pick release-4.16

openshift-cherrypick-robot commented 4 months ago

@simonpasquier: #2349 failed to apply on top of branch "release-4.16":

Applying: OCPBUGS-33645: inject trusted CA bundle into UWM Alertmanager
Using index info to reconstruct a base tree...
M   assets/alertmanager-user-workload/alertmanager.yaml
Falling back to patching base and 3-way merge...
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-33645: 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/2349#issuecomment-2134675690): >/cherry-pick release-4.16 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.