Add NetworkPolicy rule name in Traceflow observation

Update Traceflow e2e tests to verify "NetworkPolicy" and "NetworkPolicyRule" in Traceflow observation. Signed-off-by: Kumar Atish <atish.iaf@gmail.com>
antrea-io · Nov 16, 2023 · d2cc4a5 · d2cc4a5
1 parent bdf2d6b
commit d2cc4a5
Show file tree

Hide file tree

Showing 13 changed files with 344 additions and 55 deletions.
diff --git a/build/charts/antrea/crds/traceflow.yaml b/build/charts/antrea/crds/traceflow.yaml
@@ -438,6 +438,8 @@ spec:
                               type: string
                             networkPolicy:
                               type: string
+                            networkPolicyRule:
+                              type: string
                             ttl:
                               type: integer
                               minimum: 0

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -5048,6 +5048,8 @@ spec:
                               type: string
                             networkPolicy:
                               type: string
+                            networkPolicyRule:
+                              type: string
                             ttl:
                               type: integer
                               minimum: 0

diff --git a/build/yamls/antrea-crds.yml b/build/yamls/antrea-crds.yml
@@ -5021,6 +5021,8 @@ spec:
                               type: string
                             networkPolicy:
                               type: string
+                            networkPolicyRule:
+                              type: string
                             ttl:
                               type: integer
                               minimum: 0

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -5048,6 +5048,8 @@ spec:
                               type: string
                             networkPolicy:
                               type: string
+                            networkPolicyRule:
+                              type: string
                             ttl:
                               type: integer
                               minimum: 0

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -5048,6 +5048,8 @@ spec:
                               type: string
                             networkPolicy:
                               type: string
+                            networkPolicyRule:
+                              type: string
                             ttl:
                               type: integer
                               minimum: 0

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -5048,6 +5048,8 @@ spec:
                               type: string
                             networkPolicy:
                               type: string
+                            networkPolicyRule:
+                              type: string
                             ttl:
                               type: integer
                               minimum: 0

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -5048,6 +5048,8 @@ spec:
                               type: string
                             networkPolicy:
                               type: string
+                            networkPolicyRule:
+                              type: string
                             ttl:
                               type: integer
                               minimum: 0

diff --git a/pkg/agent/controller/traceflow/packetin.go b/pkg/agent/controller/traceflow/packetin.go
@@ -207,6 +207,10 @@ func (c *Controller) parsePacketIn(pktIn *ofctrl.PacketIn) (*crdv1beta1.Traceflo
 			npRef := c.networkPolicyQuerier.GetNetworkPolicyByRuleFlowID(egressInfo)
 			if npRef != nil {
 				ob.NetworkPolicy = npRef.ToString()
+				ruleRef := c.networkPolicyQuerier.GetRuleByFlowID(egressInfo)
+				if ruleRef != nil {
+					ob.NetworkPolicyRule = ruleRef.Name
+				}
 			}
 			obs = append(obs, *ob)
 		}
@@ -222,6 +226,10 @@ func (c *Controller) parsePacketIn(pktIn *ofctrl.PacketIn) (*crdv1beta1.Traceflo
 		npRef := c.networkPolicyQuerier.GetNetworkPolicyByRuleFlowID(ingressInfo)
 		if npRef != nil {
 			ob.NetworkPolicy = npRef.ToString()
+			ruleRef := c.networkPolicyQuerier.GetRuleByFlowID(ingressInfo)
+			if ruleRef != nil {
+				ob.NetworkPolicyRule = ruleRef.Name
+			}
 		}
 		obs = append(obs, *ob)
 	}
@@ -237,6 +245,7 @@ func (c *Controller) parsePacketIn(pktIn *ofctrl.PacketIn) (*crdv1beta1.Traceflo
 			if ruleRef := c.networkPolicyQuerier.GetRuleByFlowID(notAllowConjInfo); ruleRef != nil {
 				if npRef := ruleRef.PolicyRef; npRef != nil {
 					ob.NetworkPolicy = npRef.ToString()
+					ob.NetworkPolicyRule = ruleRef.Name
 				}
 				if ruleRef.Action != nil && *ruleRef.Action == crdv1beta1.RuleActionReject {
 					ob.Action = crdv1beta1.ActionRejected