Skip to content

Commit 4df65da

Browse files
authored
[NPM] pushing Netpol cache update below errors (#826)
* [NPM] pushing Netpol cache update below errors * removing some non critical err returns * Revert "removing some non critical err returns" This reverts commit 46d5ab4.
1 parent 3799358 commit 4df65da

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

npm/nwpolicy.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkP
156156
npMgr.ProcessedNpMap[npProcessedKey] = npObj
157157
}
158158

159-
npMgr.RawNpMap[npKey] = npObj
160-
161159
sets, namedPorts, lists, ingressIPCidrs, egressIPCidrs, iptEntries = translatePolicy(npObj)
162160
for _, set := range sets {
163161
log.Logf("Creating set: %v, hashedSet: %v", set, util.GetHashedName(set))
@@ -192,6 +190,7 @@ func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkP
192190
return err
193191
}
194192
}
193+
npMgr.RawNpMap[npKey] = npObj
195194

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

244-
delete(npMgr.RawNpMap, npKey)
245-
246243
if oldPolicy, oldPolicyExists := npMgr.ProcessedNpMap[npProcessedKey]; oldPolicyExists {
247244
deductedPolicy, err := deductPolicy(oldPolicy, npObj)
248245
if err != nil {
@@ -264,6 +261,7 @@ func (npMgr *NetworkPolicyManager) DeleteNetworkPolicy(npObj *networkingv1.Netwo
264261
return err
265262
}
266263
}
264+
delete(npMgr.RawNpMap, npKey)
267265

268266
metrics.NumPolicies.Dec()
269267

0 commit comments

Comments
 (0)