Closed openshift-cherrypick-robot closed 1 year ago
@openshift-cherrypick-robot: Jira Issue OCPBUGS-198 has been cloned as Jira Issue OCPBUGS-1713. Retitling PR to link against new bug. /retitle [release-4.11] Bug OCPBUGS-1713: Cleanup KuryrPort when Pod is missing
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-1713, 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.
@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh
.
/jira refresh
@dulek: This pull request references Jira Issue OCPBUGS-1713, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @eurijon
/lgtm /approve /override ci/prow/e2e-openstack-kuryr
It's all good, only the expected test fails.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: dulek, openshift-cherrypick-robot
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@dulek: Overrode contexts on behalf of dulek: ci/prow/e2e-openstack-kuryr
@openshift-cherrypick-robot: all tests passed!
Full PR test history. Your PR dashboard.
/label backport-risk-assessed
@eurijon, I think this is good to go.
/label cherry-pick-approved
@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-1713 has been moved to the MODIFIED state.
/chery-pick release-4.10
/cherry-pick release-4.10
@dulek: #694 failed to apply on top of branch "release-4.10":
Applying: Cleanup KuryrPort when Pod is missing
Using index info to reconstruct a base tree...
M kuryr_kubernetes/controller/drivers/vif_pool.py
M kuryr_kubernetes/controller/handlers/kuryrport.py
M kuryr_kubernetes/tests/unit/controller/drivers/test_vif_pool.py
M kuryr_kubernetes/tests/unit/test_utils.py
M kuryr_kubernetes/utils.py
Falling back to patching base and 3-way merge...
Auto-merging kuryr_kubernetes/utils.py
CONFLICT (content): Merge conflict in kuryr_kubernetes/utils.py
Auto-merging kuryr_kubernetes/tests/unit/test_utils.py
CONFLICT (content): Merge conflict in kuryr_kubernetes/tests/unit/test_utils.py
Auto-merging kuryr_kubernetes/tests/unit/controller/drivers/test_vif_pool.py
Auto-merging kuryr_kubernetes/controller/handlers/kuryrport.py
Auto-merging kuryr_kubernetes/controller/drivers/vif_pool.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Cleanup KuryrPort when Pod is missing
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 kuryr-cni-container-v4.11.0-202305020028.p0.g93daed6.assembly.stream for distgit kuryr-cni. All builds following this will include this PR.
[ART PR BUILD NOTIFIER]
This PR has been included in build kuryr-controller-container-v4.11.0-202305020028.p0.g93daed6.assembly.stream for distgit kuryr-controller. All builds following this will include this PR.
This is an automated cherry-pick of #691
/assign dulek