Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-43378: fix(discovery): Handle cache.DeletedFinalStateUnknown in node informers' DeleteFunc #229

Merged
merged 1 commit into from
Oct 22, 2024
Merged

OCPBUGS-43378: fix(discovery): Handle cache.DeletedFinalStateUnknown in node informers' DeleteFunc #229

merged 1 commit into from
Oct 22, 2024

Conversation

machine424
Copy link

cherry-picking prometheus#15170

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 18, 2024
@openshift-ci-robot
Copy link

@machine424: This pull request references Jira Issue OCPBUGS-43378, which is invalid:

  • expected the bug to target the "4.18.0" version, but no target version was set

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:

cherry-picking prometheus#15170

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2024
@machine424
Copy link
Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 18, 2024
@openshift-ci-robot
Copy link

@machine424: This pull request references Jira Issue OCPBUGS-43378, 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.18.0) matches configured target version for branch (4.18.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:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Oct 18, 2024

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: juzhao.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@machine424: This pull request references Jira Issue OCPBUGS-43378, 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.18.0) matches configured target version for branch (4.18.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:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@machine424
Copy link
Author

/jira backport release-4.17,release-4.16,release-4.15,release-4.14

@openshift-ci-robot
Copy link

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15
/cherrypick release-4.14

In response to this:

/jira backport release-4.17,release-4.16,release-4.15,release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link

@openshift-ci-robot: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.

In response to this:

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15
/cherrypick release-4.14

In response to this:

/jira backport release-4.17,release-4.16,release-4.15,release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@machine424
Copy link
Author

/retest-required

@simonpasquier
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Oct 22, 2024

[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

Needs approval from an approver in each of these files:
  • OWNERS [machine424,simonpasquier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Oct 22, 2024

@machine424: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit dea4eae into openshift:master Oct 22, 2024
8 checks passed
@openshift-ci-robot
Copy link

@machine424: Jira Issue OCPBUGS-43378: All pull requests linked via external trackers have merged:

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

In response to this:

cherry-picking prometheus#15170

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link

@openshift-ci-robot: new pull request created: #230

In response to this:

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15
/cherrypick release-4.14

In response to this:

/jira backport release-4.17,release-4.16,release-4.15,release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 22, 2024
Merged
@openshift-cherrypick-robot
Copy link

@openshift-ci-robot: new pull request created: #231

In response to this:

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15
/cherrypick release-4.14

In response to this:

/jira backport release-4.17,release-4.16,release-4.15,release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 22, 2024
Open
@openshift-cherrypick-robot
Copy link

@openshift-ci-robot: #229 failed to apply on top of branch "release-4.15":

Applying: fix(discovery): Handle cache.DeletedFinalStateUnknown in node informers' DeleteFunc
Using index info to reconstruct a base tree...
M	discovery/kubernetes/endpoints.go
M	discovery/kubernetes/endpointslice.go
M	discovery/kubernetes/kubernetes.go
M	discovery/kubernetes/kubernetes_test.go
M	discovery/kubernetes/node.go
M	discovery/kubernetes/pod.go
Falling back to patching base and 3-way merge...
Auto-merging discovery/kubernetes/pod.go
Auto-merging discovery/kubernetes/node.go
Auto-merging discovery/kubernetes/kubernetes_test.go
CONFLICT (content): Merge conflict in discovery/kubernetes/kubernetes_test.go
Auto-merging discovery/kubernetes/kubernetes.go
CONFLICT (content): Merge conflict in discovery/kubernetes/kubernetes.go
Auto-merging discovery/kubernetes/endpointslice.go
Auto-merging discovery/kubernetes/endpoints.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix(discovery): Handle cache.DeletedFinalStateUnknown in node informers' DeleteFunc

In response to this:

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15
/cherrypick release-4.14

In response to this:

/jira backport release-4.17,release-4.16,release-4.15,release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@openshift-ci-robot: #229 failed to apply on top of branch "release-4.14":

Applying: fix(discovery): Handle cache.DeletedFinalStateUnknown in node informers' DeleteFunc
Using index info to reconstruct a base tree...
M	discovery/kubernetes/endpoints.go
M	discovery/kubernetes/endpointslice.go
M	discovery/kubernetes/kubernetes.go
M	discovery/kubernetes/kubernetes_test.go
M	discovery/kubernetes/node.go
M	discovery/kubernetes/pod.go
Falling back to patching base and 3-way merge...
Auto-merging discovery/kubernetes/pod.go
Auto-merging discovery/kubernetes/node.go
Auto-merging discovery/kubernetes/kubernetes_test.go
CONFLICT (content): Merge conflict in discovery/kubernetes/kubernetes_test.go
Auto-merging discovery/kubernetes/kubernetes.go
CONFLICT (content): Merge conflict in discovery/kubernetes/kubernetes.go
Auto-merging discovery/kubernetes/endpointslice.go
Auto-merging discovery/kubernetes/endpoints.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix(discovery): Handle cache.DeletedFinalStateUnknown in node informers' DeleteFunc

In response to this:

@machine424: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15
/cherrypick release-4.14

In response to this:

/jira backport release-4.17,release-4.16,release-4.15,release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: golang-github-prometheus-prometheus
This PR has been included in build golang-github-prometheus-prometheus-container-v4.18.0-202410221941.p0.gdea4eae.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielmellado danielmellado Awaiting requested review from danielmellado

@jan--f jan--f Awaiting requested review from jan--f

Assignees

@simonpasquier simonpasquier

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@machine424 @openshift-ci-robot @openshift-cherrypick-robot @simonpasquier @openshift-bot