😿 Failed to sync the upstream PRs: #99, #100, #101

[magic-mirror-bot]

🪞 Magic Mirror 🪞 failed to sync the following upstream pull-requests because one or more patches couldn't cleanly apply:

• Update cache filtering granularity to align with SA permissions open-cluster-management-io/governance-policy-framework-addon#99
• Fix the cache configuration for controller-runtime 0.16 open-cluster-management-io/governance-policy-framework-addon#100
• Prevent panic when using the managed-cluster-configfile argument open-cluster-management-io/governance-policy-framework-addon#101

Syncing is paused for the branch main on stolostron/governance-policy-framework-addon until the issue is manually resolved and this issue is closed.

Syncing error:

Error: Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: could not apply 9d7cd6c... Update cache filtering granularity to align with SA permissions
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

Commands to recreate the issue:

git cherry-pick -x 9d7cd6c0f734982158e21c01400703b33b27fce3~1..9d7cd6c0f734982158e21c01400703b33b27fce3 --allow-empty --keep-redundant-commits
git cherry-pick -x 823d36eb6d48b366683a536415fc5bb24038ca26~1..823d36eb6d48b366683a536415fc5bb24038ca26 --allow-empty --keep-redundant-commits
git cherry-pick -x 08dd22943bbd117056f06d0bd60ab12fec16c9d8~1..08dd22943bbd117056f06d0bd60ab12fec16c9d8 --allow-empty --keep-redundant-commits