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: #158 #556

Merged
merged 2 commits into from
Aug 10, 2023

Conversation

magic-mirror-bot[bot]
Copy link

@magic-mirror-bot magic-mirror-bot bot commented Aug 9, 2023

Previously, these settings were not being applied to the config used
in 'hosted mode'. This commit also includes a typo fix, and adjusts some
settings used by the tests.

Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
(cherry picked from commit 2078334)
@JustinKuli
Copy link
Contributor

/cherry-pick release-2.8

@openshift-cherrypick-robot

@JustinKuli: once the present PR merges, I will cherry-pick it on top of release-2.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-2.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Previously, the evaluation interval could prevent policies from being
applied on new namespaces when they appeared. Now, a new controller
watches namespaces on the target cluster, and can signal to the config
policy controller when a policy's selected namespaces have changed, so
that it can be re-evaluated.

A new controller-manager is used in hosted mode, in order to create a
cache for the namespaces on the target cluster. This change required
some setup adjustments in order to start both managers in this case.

Refs:
 - https://issues.redhat.com/browse/ACM-6428

Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
(cherry picked from commit 7e64817)
@dhaiducek dhaiducek force-pushed the magic-mirror-main-1691601192640 branch from 643772e to 1c70dff Compare August 10, 2023 14:43
@openshift-ci openshift-ci bot removed the lgtm label Aug 10, 2023
@openshift-ci
Copy link

openshift-ci bot commented Aug 10, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhaiducek, JustinKuli, magic-mirror-bot[bot], mprahl

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [JustinKuli,dhaiducek,mprahl]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sonarcloud
Copy link

sonarcloud bot commented Aug 10, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

91.9% 91.9% Coverage
0.0% 0.0% Duplication

@openshift-merge-robot openshift-merge-robot merged commit 8097c69 into main Aug 10, 2023
11 checks passed
@openshift-merge-robot openshift-merge-robot deleted the magic-mirror-main-1691601192640 branch August 10, 2023 15:33
@openshift-cherrypick-robot

@JustinKuli: #556 failed to apply on top of branch "release-2.8":

Applying: Set Burst and QPS on target k8s client
Applying: Watch namespaces to evaluate when they change
Using index info to reconstruct a base tree...
M	controllers/configurationpolicy_controller.go
M	controllers/configurationpolicy_controller_test.go
M	test/e2e/case19_ns_selector_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/case19_ns_selector_test.go
CONFLICT (content): Merge conflict in test/e2e/case19_ns_selector_test.go
Auto-merging controllers/configurationpolicy_controller_test.go
Auto-merging controllers/configurationpolicy_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Watch namespaces to evaluate when they change
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".

In response to this:

/cherry-pick release-2.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

😿 Failed to sync the upstream PRs: #158
5 participants