Compliance multi-tenant changes #3111
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
caseydavenport
requested changes
Jan 12, 2024
Josh-Tigera
force-pushed
the
josh.compliance-mt
branch
from
5417b37 to
2f2fe10
Compare
Josh-Tigera
added
release-note-not-required
docs-not-required
merge-when-ready
and removed
docs-pr-required
release-note-required
labels
caseydavenport
requested changes
Jan 16, 2024
|
Removing "merge-when-ready" label due to new commits |
|
Removing "merge-when-ready" label due to new commits |
|
|
||
| // Watch for changes to primary resource Compliance | ||
| err = c.Watch(&source.Kind{Type: &operatorv1.Compliance{}}, &handler.EnqueueRequestForObject{}) | ||
| err = complianceController.Watch(&source.Kind{Type: &operatorv1.Compliance{}}, &handler.EnqueueRequestForObject{}) |
There was a problem hiding this comment.
I think this needs to be eventHandler
| @@ -431,25 +431,25 @@ func guardianAllowTigeraPolicy(cfg *GuardianConfiguration) (*v3.NetworkPolicy, e | |||
| { | |||
| Action: v3.Allow, | |||
| Protocol: &networkpolicy.TCPProtocol, | |||
| Source: ComplianceBenchmarkerSourceEntityRule, | |||
| Source: networkpolicy.CreateSourceEntityRule(ComplianceNamespace, ComplianceBenchmarkerName), | |||
There was a problem hiding this comment.
I think for all of these single-tenant rules, you just want to use the DefaultHelper - https://github.com/Josh-Tigera/operator/blob/691931ed32299b33efcbd98c8c69d8b49f1ba760/pkg/render/common/networkpolicy/networkpolicy.go#L205
This way we still follow the same code path for single / multi-tenant code.
caseydavenport
approved these changes
Jan 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
For PR author
- [ ] If changing pkg/apis/, runmake gen-files- [ ] If changing versions, runmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.