Unify functions for Pod and ExternalEntity in networkpolicy controller

antrea-io · Aug 26, 2020 · 0f1e8fb · 0f1e8fb
1 parent 14109aa
commit 0f1e8fb
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 145 deletions.
diff --git a/go.mod b/go.mod
@@ -25,6 +25,7 @@ require (
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/mock v1.4.3
 	github.com/golang/protobuf v1.3.2
+	github.com/google/go-cmp v0.4.0
 	github.com/google/uuid v1.1.1
 	github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd
 	github.com/pkg/errors v0.9.1

diff --git a/pkg/controller/networkpolicy/endpoint_querier.go b/pkg/controller/networkpolicy/endpoint_querier.go
@@ -95,7 +95,7 @@ func (eq *endpointQuerier) QueryNetworkPolicies(namespace string, podName string
 	ingress := make([]*ruleTemp, 0)
 	egress := make([]*ruleTemp, 0)
 	// get all appliedToGroups using filter, then get applied policies using appliedToGroup
-	appliedToGroupKeys := eq.networkPolicyController.filterAppliedToGroupsForPod(pod)
+	appliedToGroupKeys := eq.networkPolicyController.filterAppliedToGroupsForPodOrExternalEntity(pod)
 	if err != nil {
 		return nil, err
 	}
@@ -118,7 +118,7 @@ func (eq *endpointQuerier) QueryNetworkPolicies(namespace string, podName string
 		}
 	}
 	// get all addressGroups using filter, then get ingress and egress policies using addressGroup
-	addressGroupKeys := eq.networkPolicyController.filterAddressGroupsForPod(pod)
+	addressGroupKeys := eq.networkPolicyController.filterAddressGroupsForPodOrExternalEntity(pod)
 	if err != nil {
 		return nil, err
 	}