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-29192: [release-4.14]: Clear (existing) error cond from Subscription, once error resolved #686

Merged
merged 2 commits into from
Feb 21, 2024
Merged

OCPBUGS-29192: [release-4.14]: Clear (existing) error cond from Subscription, once error resolved #686

merged 2 commits into from
Feb 21, 2024

Commits on Feb 20, 2024

  1. Clear (existing) error cond from Subscription, once error resolved (#… 

    …3166)

The func `removeSubsCond` takes in a list of pointers to Subscription objects, modifies the
objects that the pointers point to, but return a new list of those pointers. A [PR](operator-framework/operator-lifecycle-manager#2942) included in
the v0.25.0 release [changed the way the output of that function was being used](https://github.com/operator-framework/operator-lifecycle-manager/pull/2942/files#diff-a1760d9b7ac1e93734eea675d8d8938c96a50e995434b163c6f77c91bace9990R1146-R1155) leading to a regression. This PR fixes the `removeSubsCond` function,
fixing the regression as a result.

Closes #3162

Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 54da66a9996632315827ba37e14823de6405b4d9
    @anik120
    anik120 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    2d0e624 View commit details
    Browse the repository at this point in the history

  2. Reflect BundleUnpacking cond removal in missed e2e test (#3170) 

    PR #3166 removes the `BundleUnpacking` condition once resolution is successful.
PR #3166 [modified an e2e test](operator-framework/operator-lifecycle-manager@54da66a#diff-11f70fc71ac22d725767916f562789de88d06eb9ebe19f337a59fd7035a3ca2dR2448) to reflect that change.
However, the test being fixed in this PR is skipped for upstream, and runs only
downstream.This PR is a follow up to #3166 to reflect the `BundleUnpacking` condition
removal in the remaining test.

Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6e3f051a4d9ac32222a051029570b88c8ba9e4f6
    @anik120
    anik120 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    79fe501 View commit details
    Browse the repository at this point in the history