admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2151 from duanjiong/networkpolicy-fix

Browse Source 
fix namespace networkpolicy
This commit is contained in:
KubeSphere CI Bot
2020-06-03 16:06:36 +08:00
committed by GitHub
parent 3f86b8b35d e922a85dec
commit 43a02c8c6e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/network/nsnetworkpolicy/controller.go
View File

@@ -462,8 +462,10 @@ func (c *NSNetworkPolicyController) syncNs(key string) error {
if err != nil { if err != nil {
return err return err
} }
if len(ruleNode.From) > 0 {
policy.Spec.Ingress = append(policy.Spec.Ingress, ruleNode)
}
policy.Spec.Ingress = append(policy.Spec.Ingress, ruleNode)
if delete { if delete {
c.provider.Delete(c.provider.GetKey(AnnotationNPNAME, ns.Name)) c.provider.Delete(c.provider.GetKey(AnnotationNPNAME, ns.Name))
} else { } else {
@@ -531,7 +533,7 @@ func (c *NSNetworkPolicyController) syncNSNP(key string) error {
if err != nil { if err != nil {
if errors.IsNotFound(err) { if errors.IsNotFound(err) {
klog.V(4).Infof("NSNP %v has been deleted", key) klog.V(4).Infof("NSNP %v has been deleted", key)
c.provider.Delete(c.provider.GetKey(name, namespace)) c.provider.Delete(c.provider.GetKey(network.NSNPPrefix+name, namespace))
return nil return nil
} }