Skip to content

[NPM] pushing Netpol cache update below errors #826

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

Merged
merged 3 commits into from
Mar 20, 2021
Merged

[NPM] pushing Netpol cache update below errors #826

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6a9c2e
[NPM] pushing Netpol cache update below errors
vakalapa Mar 19, 2021
46d5ab4
removing some non critical err returns
vakalapa Mar 19, 2021
005ec29
Revert "removing some non critical err returns"
vakalapa Mar 19, 2021
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
6 changes: 2 additions & 4 deletions npm/nwpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkP
npMgr.ProcessedNpMap[npProcessedKey] = npObj
}

npMgr.RawNpMap[npKey] = npObj

sets, namedPorts, lists, ingressIPCidrs, egressIPCidrs, iptEntries = translatePolicy(npObj)
for _, set := range sets {
log.Logf("Creating set: %v, hashedSet: %v", set, util.GetHashedName(set))
Expand Down Expand Up @@ -192,6 +190,7 @@ func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkP
return err
}
}
npMgr.RawNpMap[npKey] = npObj

metrics.NumPolicies.Inc()
timer.StopAndRecord(metrics.AddPolicyExecTime)
Expand Down Expand Up @@ -241,8 +240,6 @@ func (npMgr *NetworkPolicyManager) DeleteNetworkPolicy(npObj *networkingv1.Netwo
removeCidrsRule("in", npObj.ObjectMeta.Name, npObj.ObjectMeta.Namespace, ingressIPCidrs, allNs.IpsMgr)
removeCidrsRule("out", npObj.ObjectMeta.Name, npObj.ObjectMeta.Namespace, egressIPCidrs, allNs.IpsMgr)

delete(npMgr.RawNpMap, npKey)

if oldPolicy, oldPolicyExists := npMgr.ProcessedNpMap[npProcessedKey]; oldPolicyExists {
deductedPolicy, err := deductPolicy(oldPolicy, npObj)
if err != nil {
Expand All @@ -264,6 +261,7 @@ func (npMgr *NetworkPolicyManager) DeleteNetworkPolicy(npObj *networkingv1.Netwo
return err
}
}
delete(npMgr.RawNpMap, npKey)

metrics.NumPolicies.Dec()

Expand Down