Address comments for PR #2 of flow aggregator

build/yamls/flow-aggregator.yml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  flow-aggregator.conf: |-
+  flow-aggregator.conf: |
     # Provide the flow collector address as string with format <IP>:<port>[:<proto>], where proto is tcp or udp.
     # If no L4 transport proto is given, we consider tcp as default.
     # Defaults to "".
@@ -12,11 +12,15 @@ data:
     # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
     # Defaults to "60s".
     flowExportInterval: 60s
+
+    # Provide the protocol for flow aggregator collecting process, which is tcp or udp.
+    # Defaults to "udp"
+    collectingProtocol: "udp"
 kind: ConfigMap
 metadata:
   labels:
     app: flow-aggregator
-  name: flow-aggregator-configmap-ht56gf55k8
+  name: flow-aggregator-configmap-bt5t8c94dh
   namespace: flow-aggregator
 ---
 apiVersion: v1
@@ -28,12 +32,16 @@ metadata:
   namespace: flow-aggregator
 spec:
   ports:
-  - port: 4739
+  - name: flow-aggregator-udp
+    port: 4739
     protocol: UDP
     targetPort: 4739
+  - name: flow-aggregator-tcp
+    port: 4739
+    protocol: TCP
+    targetPort: 4739
   selector:
     app: flow-aggregator
-  type: NodePort
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -65,7 +73,7 @@ spec:
         command:
         - flow-aggregator
         image: antrea/flow-aggregator
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         name: flow-aggregator
         ports:
         - containerPort: 4739
@@ -76,5 +84,5 @@ spec:
           subPath: flow-aggregator.conf
       volumes:
       - configMap:
-          name: flow-aggregator-configmap-ht56gf55k8
+          name: flow-aggregator-configmap-bt5t8c94dh
         name: flow-aggregator-config

build/yamls/flow-aggregator/base/conf/flow-aggregator.conf

@@ -9,3 +9,7 @@ flowCollectorAddr: ""
 # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
 # Defaults to "60s".
 flowExportInterval: 60s
+
+# Provide the protocol for flow aggregator collecting process, which is tcp or udp.
+# Defaults to "udp"
+collectingProtocol: "udp"

build/yamls/flow-aggregator/base/flow-aggregator.yml

@@ -6,11 +6,15 @@ metadata:
 spec:
   selector:
     app: flow-aggregator
-  type: NodePort
   ports:
-  - port: 4739
+  - name: flow-aggregator-udp
+    port: 4739
     protocol: UDP
     targetPort: 4739
+  - name: flow-aggregator-tcp
+    port: 4739
+    protocol: TCP
+    targetPort: 4739
 ---
 apiVersion: apps/v1
 kind: Deployment

build/yamls/flow-aggregator/patches/dev/imagePullPolicy.yml

@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
         - name: flow-aggregator
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always

cmd/flow-aggregator/config.go

@@ -25,4 +25,7 @@ type FlowAggregatorConfig struct {
 	// Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
 	// Defaults to "60s".
 	FlowExportInterval string `yaml:"flowExportInterval,omitempty"`
+	// Provide the protocol for flow aggregator collecting process, which is tcp or udp.
+	// Defaults to "udp"
+	CollectingProtocol string `yaml:"collectingProtocol,omitempty"`
 }

cmd/flow-aggregator/flow-aggregator.go

@@ -27,7 +27,7 @@ func run(o *Options) error {
 	// cause the stopCh channel to be closed; if another signal is received before the program
 	// exits, we will force exit.
 	stopCh := signals.RegisterSignalHandlers()
-	flowAggregator := aggregator.NewFlowAggregator(o.flowCollectorAddr, o.exportFrequency)
+	flowAggregator := aggregator.NewFlowAggregator(o.flowCollectorAddr, o.exportInterval, o.collectingProtocol)
 	go flowAggregator.Run(stopCh)
 	<-stopCh
 	klog.Infof("Stopping flow aggregator")