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

allow multiple policies per namespace by using different key in policy #21

Merged
merged 1 commit into from
May 14, 2020
Merged

allow multiple policies per namespace by using different key in policy #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pkg/controller/grcpolicy/grcpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func (r *ReconcileGRCPolicy) Reconcile(request reconcile.Request) (reconcile.Res
}
}
instance.Status.CompliancyDetails = nil //reset CompliancyDetails
handleAddingPolicy(instance) /* #nosec G104 */
handleAddingPolicy(instance) /* #nosec G104 */
} else {
handleRemovingPolicy(instance)
// The object is being deleted
Expand Down Expand Up @@ -230,7 +230,8 @@ func PeriodicallyExecGRCPolicies(freq uint) {
plcToUpdateMap = make(map[string]*policyv1alpha1.CertificatePolicy)

// Loops through all of the cert policies
for namespace, policy := range availablePolicies.PolicyMap {
for resource, policy := range availablePolicies.PolicyMap {
namespace := strings.Split(resource, "/")[0]
klog.V(4).Infof("Checking certificates in namespace %s defined in policy %s", namespace, policy.Name)
update, nonCompliant, list := certExpiration(policy, namespace)
if strings.ToLower(string(policy.Spec.RemediationAction)) == strings.ToLower(string(policyv1alpha1.Enforce)) {
Expand Down Expand Up @@ -472,15 +473,17 @@ func handleAddingPolicy(plc *policyv1alpha1.CertificatePolicy) error {
}
//clean up that policy from the existing namepsaces, in case the modification is in the namespace selector
for _, ns := range allNamespaces {
if policy, found := availablePolicies.GetObject(ns); found {
key := fmt.Sprintf("%s/%s", ns, plc.Name)
if policy, found := availablePolicies.GetObject(key); found {
if policy.Name == plc.Name {
availablePolicies.RemoveObject(ns)
}
}
}
selectedNamespaces := common.GetSelectedNamespaces(plc.Spec.NamespaceSelector.Include, plc.Spec.NamespaceSelector.Exclude, allNamespaces)
for _, ns := range selectedNamespaces {
availablePolicies.AddObject(ns, plc)
key := fmt.Sprintf("%s/%s", ns, plc.Name)
availablePolicies.AddObject(key, plc)
}
return err
}
Expand Down