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.

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

🤖 Sync from open-cluster-management-io/config-policy-controller: #264 #900

Merged
merged 2 commits into from
Jun 10, 2024

Commits on Jun 10, 2024

  1. Limit overlap detection to the same cluster

    Otherwise, hosted mode runs into problems where it believes there will
    be an overlap, but actually the policies are for different clusters.
    
    Refs:
     - https://issues.redhat.com/browse/ACM-12032
    
    Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
    (cherry picked from commit 04184bc)
    JustinKuli authored and Magic Mirror committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    d1690c7 View commit details
    Browse the repository at this point in the history
  2. Stop subscription intervention if CSV already set

    Especially in the case of an active upgrade, the previous intervention
    logic could fight with OLM while setting the CurrentCSV in the sub
    status. Now, if CurrentCSV or InstalledCSV are set, no intervention will
    be done.
    
    Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
    (cherry picked from commit 40d47e0)
    JustinKuli authored and Magic Mirror committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    3e92860 View commit details
    Browse the repository at this point in the history