OCPBUGS-34596: Ipsec state backport

JoshSalomon commented 2 months ago

[ ] I added CHANGELOG entry for this change.
[ ] No user facing changes, so no entry in CHANGELOG was needed.

openshift-ci-robot commented 2 months ago

@JoshSalomon: This pull request references Jira Issue OCPBUGS-34596, which is invalid:

expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead

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/2384): > > >* [ ] 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.

openshift-ci[bot] commented 2 months ago

@JoshSalomon: 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	82406d513a213bc682f484d5b51de5aa45a72af5	link	false	`/test e2e-aws-ovn-single-node`

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

JoshSalomon commented 2 months ago

/jira refresh

openshift-ci-robot commented 2 months ago

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

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 ASSIGNED, 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-34597](https://issues.redhat.com//browse/OCPBUGS-34597) is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-34597](https://issues.redhat.com//browse/OCPBUGS-34597) targets the "4.16.0" version, which is one of the valid target versions: 4.16.0 * bug has dependents

Requesting review from QA contact: /cc @huiran0826

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/2384#issuecomment-2175729644): >/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 2 months ago

/approve /label backport-risk-assessed

simonpasquier commented 2 months ago

/lgtm

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoshSalomon, 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/release-4.15/OWNERS)~~ [simonpasquier] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

JoshSalomon commented 2 months ago

@wzheng1 Can you please check it and cherry-pick-approveit?

JoshSalomon commented 2 months ago

@Tai-RedHat Can you please check it and cherry-pick-approve it?

simonpasquier commented 2 months ago

/assign @Tai-RedHat

Tai-RedHat commented 2 months ago

/label cherry-pick-approved

openshift-ci-robot commented 2 months ago

@JoshSalomon: Jira Issue OCPBUGS-34596: All pull requests linked via external trackers have merged:

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

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2384): > > >* [ ] 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.

openshift-bot commented 2 months ago

[ART PR BUILD NOTIFIER]

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

openshift-merge-robot commented 2 months ago

Fix included in accepted release 4.15.0-0.nightly-2024-06-28-211758

JoshSalomon commented 1 month ago

/cherrypick release-4.14

openshift-cherrypick-robot commented 1 month ago

@JoshSalomon: #2384 failed to apply on top of branch "release-4.14":

Applying: Add ipsec state metric into telemetry
Using index info to reconstruct a base tree...
M   Documentation/data-collection.md
M   Documentation/sample-metrics.md
M   Documentation/telemetry/telemeter_query
M   manifests/0000_50_cluster-monitoring-operator_04-config.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/0000_50_cluster-monitoring-operator_04-config.yaml
CONFLICT (content): Merge conflict in manifests/0000_50_cluster-monitoring-operator_04-config.yaml
Auto-merging Documentation/telemetry/telemeter_query
CONFLICT (content): Merge conflict in Documentation/telemetry/telemeter_query
Auto-merging Documentation/sample-metrics.md
CONFLICT (content): Merge conflict in Documentation/sample-metrics.md
Auto-merging Documentation/data-collection.md
CONFLICT (content): Merge conflict in Documentation/data-collection.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 Add ipsec state metric into telemetry
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/2384#issuecomment-2268888098): >/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 / cluster-monitoring-operator

OCPBUGS-34596: Ipsec state backport #2384