Address comments for PR #2 of flow aggregator

build/yamls/flow-aggregator.yml

@@ -1,22 +1,26 @@
 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 "".
-    flowCollectorAddr: ""
+    externalFlowCollectorAddr: ""
 
     # Provide flow export interval as a duration string. This determines how often the flow aggregator exports flow
     # records to the flow collector.
     # Flow export interval should be greater than or equal to 1s (one second).
     # 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 "tcp"
+    aggregatorFlowCollectorProtocol: "tcp"
 kind: ConfigMap
 metadata:
   labels:
     app: flow-aggregator
-  name: flow-aggregator-configmap-ht56gf55k8
+  name: flow-aggregator-configmap-b4899dtfdh
   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
@@ -76,5 +84,5 @@ spec:
           subPath: flow-aggregator.conf
       volumes:
       - configMap:
-          name: flow-aggregator-configmap-ht56gf55k8
+          name: flow-aggregator-configmap-b4899dtfdh
         name: flow-aggregator-config

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

@@ -1,11 +1,15 @@
 # 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 "".
-flowCollectorAddr: ""
+externalFlowCollectorAddr: ""
 
 # Provide flow export interval as a duration string. This determines how often the flow aggregator exports flow
 # records to the flow collector.
 # Flow export interval should be greater than or equal to 1s (one second).
 # 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 "tcp"
+aggregatorFlowCollectorProtocol: "tcp"

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

cmd/flow-aggregator/config.go

@@ -18,11 +18,14 @@ type FlowAggregatorConfig struct {
 	// 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 "".
-	FlowCollectorAddr string `yaml:"flowCollectorAddr,omitempty"`
+	ExternalFlowCollectorProtocol string `yaml:"externalFlowCollectorAddr,omitempty"`
 	// Provide flow export interval as a duration string. This determines how often the flow aggregator exports flow
 	// records to the flow collector.
 	// Flow export interval should be greater than or equal to 1s (one second).
 	// 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 "tcp"
+	AggregatorFlowCollectorProtocol string `yaml:"aggregatorFlowCollectorProtocol,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.externalFlowCollectorAddr, o.exportInterval, o.aggregatorFlowCollectorProtocol)
 	go flowAggregator.Run(stopCh)
 	<-stopCh
 	klog.Infof("Stopping flow aggregator")