Closed petr-muller closed 1 month ago
@petr-muller: This pull request references Jira Issue OCPBUGS-33762, 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.
/jira refresh
@petr-muller: This pull request references Jira Issue OCPBUGS-33762, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @evakhoni
/test e2e-aws-ovn-upgrade
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: Davoska, petr-muller, wking
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest-required
Remaining retests: 0 against base HEAD 6e6bf1d848f1503b9be6369ab7a6fe814d0b980a and 2 for PR HEAD fad39d295dcd2bc0bab034f318e070ecbfae3a8f in total
@petr-muller: all tests passed!
Full PR test history. Your PR dashboard.
@petr-muller: Jira Issue OCPBUGS-33762: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-33762 has been moved to the MODIFIED state.
[ART PR BUILD NOTIFIER]
This PR has been included in build ose-tools-container-v4.17.0-202405212243.p0.g44e3cd9.assembly.stream.el9 for distgit ose-tools. All builds following this will include this PR.
/cherry-pick release-4.16
@petr-muller: #1773 failed to apply on top of branch "release-4.16":
Applying: update status: minor code cleanups
Using index info to reconstruct a base tree...
A pkg/cli/admin/upgrade/status/alerts.go
A pkg/cli/admin/upgrade/status/alerts_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/cli/admin/upgrade/status/alerts_test.go deleted in HEAD and modified in update status: minor code cleanups. Version update status: minor code cleanups of pkg/cli/admin/upgrade/status/alerts_test.go left in tree.
CONFLICT (modify/delete): pkg/cli/admin/upgrade/status/alerts.go deleted in HEAD and modified in update status: minor code cleanups. Version update status: minor code cleanups of pkg/cli/admin/upgrade/status/alerts.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update status: minor code cleanups
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".
Hm, will needs alerts to land first :/
/cherry-pick release-4.16
@petr-muller: new pull request created: #1796
Previous code used
GroupVersionKind
method on actual resources to determine group/kind strings for them, but client-go unfortunately dropsTypeMeta
on resources processed by typed client (https://github.com/kubernetes/client-go/issues/1328, https://github.com/kubernetes/client-go/issues/541). Fortunately we know what types we build insights for, so we can use appropriate strings from client code for groups and hardcode kinds ourselves.