feat: support api send and query.

antrea-io · Jun 3, 2024 · 487b01b · 487b01b
1 parent 63576b7
commit 487b01b
Show file tree

Hide file tree

Showing 16 changed files with 241 additions and 154 deletions.
diff --git a/build/charts/antrea/templates/agent/clusterrole.yaml b/build/charts/antrea/templates/agent/clusterrole.yaml
@@ -5,6 +5,18 @@ metadata:
   labels:
     app: antrea
 rules:
+  - apiGroups:
+      - stats.antrea.io
+    resources:
+      - networkpolicystats
+      - antreaclusternetworkpolicystats
+      - antreanetworkpolicystats
+      - nodeiplatencystats
+    verbs:
+      - get
+      - list
+      - create
+      - update
   - apiGroups:
       - ""
     resources:
@@ -82,14 +94,16 @@ rules:
       - nodestatssummaries
     verbs:
       - create
-  - apiGroups:
-      - controlplane.antrea.io
-    resources:
-      - nodeiplatencystats
-    verbs:
-      - create
-      - get
-      - list
+  # - apiGroups:
+  #     - controlplane.antrea.io
+  #   resources:
+  #     - nodeiplatencystats
+  #   verbs:
+  #     - create
+  #     - update
+  #     - patch
+  #     - get
+  #     - list
   - apiGroups:
       - controlplane.antrea.io
     resources:

diff --git a/build/charts/antrea/templates/antctl/clusterrole.yaml b/build/charts/antrea/templates/antctl/clusterrole.yaml
@@ -26,10 +26,12 @@ rules:
       - networkpolicystats
       - antreaclusternetworkpolicystats
       - antreanetworkpolicystats
-      - nodeiplatencystat
+      - nodeiplatencystats
     verbs:
       - get
       - list
+      - create
+      - update
   - apiGroups:
       - system.antrea.io
     resources:

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -4144,6 +4144,18 @@ metadata:
   labels:
     app: antrea
 rules:
+  - apiGroups:
+      - stats.antrea.io
+    resources:
+      - networkpolicystats
+      - antreaclusternetworkpolicystats
+      - antreanetworkpolicystats
+      - nodeiplatencystats
+    verbs:
+      - get
+      - list
+      - create
+      - update
   - apiGroups:
       - ""
     resources:
@@ -4221,14 +4233,16 @@ rules:
       - nodestatssummaries
     verbs:
       - create
-  - apiGroups:
-      - controlplane.antrea.io
-    resources:
-      - nodeiplatencystats
-    verbs:
-      - create
-      - get
-      - list
+  # - apiGroups:
+  #     - controlplane.antrea.io
+  #   resources:
+  #     - nodeiplatencystats
+  #   verbs:
+  #     - create
+  #     - update
+  #     - patch
+  #     - get
+  #     - list
   - apiGroups:
       - controlplane.antrea.io
     resources:
@@ -4405,10 +4419,12 @@ rules:
       - networkpolicystats
       - antreaclusternetworkpolicystats
       - antreanetworkpolicystats
-      - nodeiplatencystat
+      - nodeiplatencystats
     verbs:
       - get
       - list
+      - create
+      - update
   - apiGroups:
       - system.antrea.io
     resources:

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -4144,6 +4144,18 @@ metadata:
   labels:
     app: antrea
 rules:
+  - apiGroups:
+      - stats.antrea.io
+    resources:
+      - networkpolicystats
+      - antreaclusternetworkpolicystats
+      - antreanetworkpolicystats
+      - nodeiplatencystats
+    verbs:
+      - get
+      - list
+      - create
+      - update
   - apiGroups:
       - ""
     resources:
@@ -4221,14 +4233,16 @@ rules:
       - nodestatssummaries
     verbs:
       - create
-  - apiGroups:
-      - controlplane.antrea.io
-    resources:
-      - nodeiplatencystats
-    verbs:
-      - create
-      - get
-      - list
+  # - apiGroups:
+  #     - controlplane.antrea.io
+  #   resources:
+  #     - nodeiplatencystats
+  #   verbs:
+  #     - create
+  #     - update
+  #     - patch
+  #     - get
+  #     - list
   - apiGroups:
       - controlplane.antrea.io
     resources:
@@ -4405,10 +4419,12 @@ rules:
       - networkpolicystats
       - antreaclusternetworkpolicystats
       - antreanetworkpolicystats
-      - nodeiplatencystat
+      - nodeiplatencystats
     verbs:
       - get
       - list
+      - create
+      - update
   - apiGroups:
       - system.antrea.io
     resources:

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -4144,6 +4144,18 @@ metadata:
   labels:
     app: antrea
 rules:
+  - apiGroups:
+      - stats.antrea.io
+    resources:
+      - networkpolicystats
+      - antreaclusternetworkpolicystats
+      - antreanetworkpolicystats
+      - nodeiplatencystats
+    verbs:
+      - get
+      - list
+      - create
+      - update
   - apiGroups:
       - ""
     resources:
@@ -4221,14 +4233,16 @@ rules:
       - nodestatssummaries
     verbs:
       - create
-  - apiGroups:
-      - controlplane.antrea.io
-    resources:
-      - nodeiplatencystats
-    verbs:
-      - create
-      - get
-      - list
+  # - apiGroups:
+  #     - controlplane.antrea.io
+  #   resources:
+  #     - nodeiplatencystats
+  #   verbs:
+  #     - create
+  #     - update
+  #     - patch
+  #     - get
+  #     - list
   - apiGroups:
       - controlplane.antrea.io
     resources:
@@ -4405,10 +4419,12 @@ rules:
       - networkpolicystats
       - antreaclusternetworkpolicystats
       - antreanetworkpolicystats
-      - nodeiplatencystat
+      - nodeiplatencystats
     verbs:
       - get
       - list
+      - create
+      - update
   - apiGroups:
       - system.antrea.io
     resources:

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -4157,6 +4157,18 @@ metadata:
   labels:
     app: antrea
 rules:
+  - apiGroups:
+      - stats.antrea.io
+    resources:
+      - networkpolicystats
+      - antreaclusternetworkpolicystats
+      - antreanetworkpolicystats
+      - nodeiplatencystats
+    verbs:
+      - get
+      - list
+      - create
+      - update
   - apiGroups:
       - ""
     resources:
@@ -4234,14 +4246,16 @@ rules:
       - nodestatssummaries
     verbs:
       - create
-  - apiGroups:
-      - controlplane.antrea.io
-    resources:
-      - nodeiplatencystats
-    verbs:
-      - create
-      - get
-      - list
+  # - apiGroups:
+  #     - controlplane.antrea.io
+  #   resources:
+  #     - nodeiplatencystats
+  #   verbs:
+  #     - create
+  #     - update
+  #     - patch
+  #     - get
+  #     - list
   - apiGroups:
       - controlplane.antrea.io
     resources:
@@ -4418,10 +4432,12 @@ rules:
       - networkpolicystats
       - antreaclusternetworkpolicystats
       - antreanetworkpolicystats
-      - nodeiplatencystat
+      - nodeiplatencystats
     verbs:
       - get
       - list
+      - create
+      - update
   - apiGroups:
       - system.antrea.io
     resources:

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -4144,6 +4144,18 @@ metadata:
   labels:
     app: antrea
 rules:
+  - apiGroups:
+      - stats.antrea.io
+    resources:
+      - networkpolicystats
+      - antreaclusternetworkpolicystats
+      - antreanetworkpolicystats
+      - nodeiplatencystats
+    verbs:
+      - get
+      - list
+      - create
+      - update
   - apiGroups:
       - ""
     resources:
@@ -4221,14 +4233,16 @@ rules:
       - nodestatssummaries
     verbs:
       - create
-  - apiGroups:
-      - controlplane.antrea.io
-    resources:
-      - nodeiplatencystats
-    verbs:
-      - create
-      - get
-      - list
+  # - apiGroups:
+  #     - controlplane.antrea.io
+  #   resources:
+  #     - nodeiplatencystats
+  #   verbs:
+  #     - create
+  #     - update
+  #     - patch
+  #     - get
+  #     - list
   - apiGroups:
       - controlplane.antrea.io
     resources:
@@ -4405,10 +4419,12 @@ rules:
       - networkpolicystats
       - antreaclusternetworkpolicystats
       - antreanetworkpolicystats
-      - nodeiplatencystat
+      - nodeiplatencystats
     verbs:
       - get
       - list
+      - create
+      - update
   - apiGroups:
       - system.antrea.io
     resources:

diff --git a/pkg/agent/monitortool/latency_store.go b/pkg/agent/monitortool/latency_store.go
@@ -20,6 +20,7 @@ import (
 	"sync"
 	"time"
 
+	stv1aplpha1 "antrea.io/antrea/pkg/apis/stats/v1alpha1"
 	"github.com/containernetworking/plugins/pkg/ip"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -233,3 +234,34 @@ func (s *LatencyStore) DeleteStaleNodeIPs() {
 		}
 	}
 }
+
+// ConvertList converts the latency store to a list of NodeIPLatencyEntry.
+func (l *LatencyStore) ConvertList() []stv1aplpha1.NodeIPLatencyEntry {
+	l.mutex.RLock()
+	defer l.mutex.RUnlock()
+
+	entries := make([]stv1aplpha1.NodeIPLatencyEntry, 0, len(l.nodeIPLatencyMap))
+	for nodeIP, entry := range l.nodeIPLatencyMap {
+		// Find the Node name for the given Node IP
+		var nodeName string
+		for name, ips := range l.nodeTargetIPsMap {
+			for _, ip := range ips {
+				if ip.String() == nodeIP {
+					nodeName = name
+					break
+				}
+			}
+		}
+
+		tempEntry := stv1aplpha1.NodeIPLatencyEntry{
+			NodeName:        nodeName,
+			TargetIP:        nodeIP,
+			LastSendTime:    entry.LastSendTime.Unix(),
+			LastRecvTime:    entry.LastRecvTime.Unix(),
+			LastMeasuredRTT: entry.LastMeasuredRTT.Nanoseconds(),
+		}
+		entries = append(entries, tempEntry)
+	}
+
+	return entries
+}