From ba4e7b8a4d66f06a372b74f540d20caf5172ffa2 Mon Sep 17 00:00:00 2001 From: vakr Date: Thu, 25 Mar 2021 09:48:18 -0700 Subject: [PATCH 1/4] Remove non-fatal error which is causing early bail out --- npm/nwpolicy.go | 1 - 1 file changed, 1 deletion(-) diff --git a/npm/nwpolicy.go b/npm/nwpolicy.go index e9dd200dc2..dc744f01bd 100644 --- a/npm/nwpolicy.go +++ b/npm/nwpolicy.go @@ -179,7 +179,6 @@ func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkP } if err = npMgr.InitAllNsList(); err != nil { metrics.SendErrorLogAndMetric(util.NetpolID, "[AddNetworkPolicy] Error: initializing all-namespace ipset list with err: %v", err) - return err } createCidrsRule("in", npObj.ObjectMeta.Name, npObj.ObjectMeta.Namespace, ingressIPCidrs, ipsMgr) createCidrsRule("out", npObj.ObjectMeta.Name, npObj.ObjectMeta.Namespace, egressIPCidrs, ipsMgr) From 8e4532f76eba6e467cf1593ad55bb5c3f5ec6291 Mon Sep 17 00:00:00 2001 From: vakr Date: Thu, 25 Mar 2021 10:39:55 -0700 Subject: [PATCH 2/4] removing the function --- npm/nwpolicy.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/npm/nwpolicy.go b/npm/nwpolicy.go index dc744f01bd..c757a7c984 100644 --- a/npm/nwpolicy.go +++ b/npm/nwpolicy.go @@ -177,9 +177,7 @@ func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkP return err } } - if err = npMgr.InitAllNsList(); err != nil { - metrics.SendErrorLogAndMetric(util.NetpolID, "[AddNetworkPolicy] Error: initializing all-namespace ipset list with err: %v", err) - } + createCidrsRule("in", npObj.ObjectMeta.Name, npObj.ObjectMeta.Namespace, ingressIPCidrs, ipsMgr) createCidrsRule("out", npObj.ObjectMeta.Name, npObj.ObjectMeta.Namespace, egressIPCidrs, ipsMgr) iptMgr := allNs.iptMgr From 86c049292d45ab977cc3b03b9b759657a75d6530 Mon Sep 17 00:00:00 2001 From: vakr Date: Thu, 25 Mar 2021 10:41:42 -0700 Subject: [PATCH 3/4] removing the function --- npm/nwpolicy.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/npm/nwpolicy.go b/npm/nwpolicy.go index c757a7c984..2ffd0c1e5d 100644 --- a/npm/nwpolicy.go +++ b/npm/nwpolicy.go @@ -99,15 +99,6 @@ func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkP return err } - if ns, exists = npMgr.NsMap[npNs]; !exists { - ns, err = newNs(npNs) - if err != nil { - metrics.SendErrorLogAndMetric(util.NetpolID, "[AddNetworkPolicy] Error: creating namespace %s with err: %v", npNs, err) - return err - } - npMgr.NsMap[npNs] = ns - } - if npMgr.policyExists(npObj) { return nil } From 7895392494c8c918a4f5696bbc8bb8a7396bbcab Mon Sep 17 00:00:00 2001 From: vakr Date: Thu, 25 Mar 2021 10:48:10 -0700 Subject: [PATCH 4/4] removing the function --- npm/nwpolicy.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/npm/nwpolicy.go b/npm/nwpolicy.go index 2ffd0c1e5d..e03ef79049 100644 --- a/npm/nwpolicy.go +++ b/npm/nwpolicy.go @@ -80,8 +80,6 @@ func (npMgr *NetworkPolicyManager) policyExists(npObj *networkingv1.NetworkPolic func (npMgr *NetworkPolicyManager) AddNetworkPolicy(npObj *networkingv1.NetworkPolicy) error { var ( err error - ns *Namespace - exists bool npNs = util.GetNSNameWithPrefix(npObj.ObjectMeta.Namespace) npName = npObj.ObjectMeta.Name allNs = npMgr.NsMap[util.KubeAllNamespacesFlag]