Address comments

.github/workflows/build.yml

@@ -5,10 +5,12 @@ on:
     branches:
       - master
       - release-*
+      - feature/flow-aggregator
   push:
     branches:
       - master
       - release-*
+      - feature/flow-aggregator
 
 jobs:
   check-changes:
@@ -96,3 +98,20 @@ jobs:
         echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         make push
         make push-release
+
+  build-flow-aggregator:
+    needs: check-changes
+    if: ${{ needs.check-changes.outputs.has_changes == 'yes' || github.event_name == 'push' }}
+    runs-on: [ubuntu-18.04]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build flow-aggregator Docker image
+      run: make flow-aggregator-ubuntu
+    - name: Push flow-aggregator Docker image to registry
+      if: ${{ github.repository == 'vmware-tanzu/antrea' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      env:
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      run: |
+        echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        docker push antrea/flow-aggregator:latest

.github/workflows/build_tag.yml

@@ -49,3 +49,17 @@ jobs:
           VERSION="${TAG:10}" make octant-antrea-ubuntu
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
           docker push antrea/octant-antrea-ubuntu:"${TAG:10}"
+
+  build-flow-aggregator:
+    runs-on: [ubuntu-18.04]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build flow-aggregator Docker image and push to registry
+      env:
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        TAG: ${{ github.ref }}
+      run: |
+        VERSION="${TAG:10}" make flow-aggregator-ubuntu
+        echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        docker push antrea/flow-aggregator:"${TAG:10}"

.github/workflows/go.yml

@@ -5,11 +5,13 @@ on:
     - master
     - release-*
     - ipv6
+    - feature/flow-aggregator
   push:
     branches:
     - master
     - release-*
     - ipv6
+    - feature/flow-aggregator
 jobs:
 
 

.github/workflows/kind.yml

@@ -5,11 +5,13 @@ on:
     - master
     - release-*
     - ipv6
+    - feature/flow-aggregator
   push:
     branches:
     - master
     - release-*
     - ipv6
+    - feature/flow-aggregator
 
 env:
   KIND_VERSION: v0.9.0

.github/workflows/upload_release_assets.yml

@@ -178,6 +178,15 @@ jobs:
         asset_path: ./assets/antrea-windows.yml
         asset_name: antrea-windows.yml
         asset_content_type: application/octet-stream
+    - name: Upload flow-aggregator.yml
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./assets/flow-aggregator.yml
+        asset_name: flow-aggregator.yml
+        asset_content_type: application/octet-stream
     - name: Upload antrea-agent-windows-x86_64.exe
       uses: actions/upload-release-asset@v1
       env:

Makefile

@@ -70,6 +70,11 @@ windows-bin:
 	GOOS=windows $(GO) build -o $(BINDIR) $(GOFLAGS) -ldflags '$(LDFLAGS)' github.com/vmware-tanzu/antrea/cmd/antrea-cni \
 		github.com/vmware-tanzu/antrea/cmd/antrea-agent
 
+.PHONY: flow-aggregator
+flow-aggregator:
+	@mkdir -p $(BINDIR)
+	GOOS=linux $(GO) build -o $(BINDIR) $(GOFLAGS) -ldflags '$(LDFLAGS)' github.com/vmware-tanzu/antrea/cmd/flow-aggregator
+
 .PHONY: test-unit test-integration
 ifeq ($(UNAME_S),Linux)
 test-unit: .linux-test-unit
@@ -294,6 +299,7 @@ manifest:
 	$(CURDIR)/hack/generate-manifest.sh --mode dev --cloud AKS --encap-mode networkPolicyOnly > build/yamls/antrea-aks.yml
 	$(CURDIR)/hack/generate-manifest-octant.sh --mode dev > build/yamls/antrea-octant.yml
 	$(CURDIR)/hack/generate-manifest-windows.sh --mode dev > build/yamls/antrea-windows.yml
+	$(CURDIR)/hack/generate-manifest-flow-aggregator.sh --mode dev > build/yamls/flow-aggregator.yml
 
 .PHONY: manifest-coverage
 manifest-coverage:
@@ -306,6 +312,16 @@ octant-antrea-ubuntu:
 	docker build --pull -t antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.octant.ubuntu .
 	docker tag antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) antrea/octant-antrea-ubuntu
 
+.PHONY: flow-aggregator-ubuntu
+flow-aggregator-ubuntu:
+	@echo "===> Building antrea/flow-aggregator Docker image <==="
+ifneq ($(DOCKER_REGISTRY),"")
+	docker build -t antrea/flow-aggregator:$(DOCKER_IMG_VERSION) -f build/images/flow-aggregator/Dockerfile .
+else
+	docker build --pull -t antrea/flow-aggregator:$(DOCKER_IMG_VERSION) -f build/images/flow-aggregator/Dockerfile .
+endif
+	docker tag antrea/flow-aggregator:$(DOCKER_IMG_VERSION) antrea/flow-aggregator
+
 .PHONY: verify
 verify:
 	@echo "===> Verifying spellings <==="

build/images/flow-aggregator/Dockerfile

@@ -0,0 +1,16 @@
+FROM golang:1.15 as flow-aggregator-build
+
+WORKDIR /antrea
+
+COPY . /antrea
+
+RUN make flow-aggregator
+
+FROM antrea/base-ubuntu:2.14.0
+
+LABEL maintainer="Antrea <[email protected]>"
+LABEL description="The docker image for the flow aggregator"
+
+USER root
+
+COPY --from=flow-aggregator-build /antrea/bin/flow-aggregator /usr/local/bin/

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

@@ -1,46 +1,43 @@
 apiVersion: v1
+data:
+  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.
+    flowCollectorAddr: ""
+
+    # 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".
+    flowExportInterval: 60s
+kind: ConfigMap
+metadata:
+  labels:
+    app: flow-aggregator
+  name: flow-aggregator-configmap-gcd5tkk2dd
+  namespace: flow-aggregator
+---
+apiVersion: v1
 kind: Service
 metadata:
   labels:
     app: flow-aggregator
   name: flow-aggregator
   namespace: flow-aggregator
 spec:
-  selector:
-    app: flow-aggregator
-  type: NodePort
   ports:
   - port: 4739
     protocol: UDP
     targetPort: 4739
----
-apiVersion: v1
-data:
-  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: "10.96.28.149:4739:udp"
-
-    # Provide flow export frequency, which is the number of seconds elapsed before flow aggregator exports flow
-    # records to the flow collector.
-    # Flow export frequency should be greater than or equal to 1.
-    # Defaults to "60s".
-    flowExportFrequency: 60s
-kind: ConfigMap
-metadata:
-  annotations: {}
-  labels:
+  selector:
     app: flow-aggregator
-  name: flow-aggregator-configmap
-  namespace: flow-aggregator
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: flow-aggregator
   labels:
     app: flow-aggregator
+  name: flow-aggregator
   namespace: flow-aggregator
 spec:
   replicas: 1
@@ -63,18 +60,18 @@ spec:
         - --log_file_max_num=4
         - --v=0
         command:
-          - flow-aggregator
+        - flow-aggregator
+        image: antrea/flow-aggregator
+        imagePullPolicy: IfNotPresent
         name: flow-aggregator
-        image: dreamtalen/flow-aggregator
         ports:
-          - containerPort: 4739
+        - containerPort: 4739
         volumeMounts:
         - mountPath: /etc/flow-aggregator/flow-aggregator.conf
           name: flow-aggregator-config
           readOnly: true
           subPath: flow-aggregator.conf
       volumes:
-      - name: flow-aggregator-config
-        configMap:
-          name: flow-aggregator-configmap
-
+      - configMap:
+          name: flow-aggregator-configmap-gcd5tkk2dd
+        name: flow-aggregator-config

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

@@ -0,0 +1,9 @@
+# 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.
+flowCollectorAddr: ""
+
+# 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".
+flowExportInterval: 60s

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

@@ -0,0 +1,51 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: flow-aggregator
+  namespace: flow-aggregator
+spec:
+  selector:
+    app: flow-aggregator
+  ports:
+  - port: 4739
+    protocol: UDP
+    targetPort: 4739
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: flow-aggregator
+  namespace: flow-aggregator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: flow-aggregator
+  template:
+    spec:
+      containers:
+      - args:
+        - --config
+        - /etc/flow-aggregator/flow-aggregator.conf
+        - --logtostderr=false
+        - --log_dir=/var/log/flowaggregator
+        - --alsologtostderr
+        - --log_file_max_size=100
+        - --log_file_max_num=4
+        - --v=0
+        command:
+          - flow-aggregator
+        name: flow-aggregator
+        image: antrea/flow-aggregator
+        ports:
+          - containerPort: 4739
+        volumeMounts:
+        - mountPath: /etc/flow-aggregator/flow-aggregator.conf
+          name: flow-aggregator-config
+          readOnly: true
+          subPath: flow-aggregator.conf
+      volumes:
+      - name: flow-aggregator-config
+        configMap:
+          name: flow-aggregator-configmap
+

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

@@ -0,0 +1,11 @@
+resources:
+- flow-aggregator.yml
+configMapGenerator:
+- files:
+  - conf/flow-aggregator.conf
+  name: flow-aggregator-configmap
+commonLabels:
+  app: flow-aggregator
+namespace: flow-aggregator
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization

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

@@ -0,0 +1,11 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: flow-aggregator
+  namespace: flow-aggregator
+spec:
+  template:
+    spec:
+      containers:
+        - name: flow-aggregator
+          imagePullPolicy: IfNotPresent

build/yamls/flow-aggregator/patches/release/.gitignore

@@ -0,0 +1 @@
+# placeholder

cmd/flow-aggregator/config.go

@@ -19,9 +19,10 @@ type FlowAggregatorConfig struct {
 	// If no L4 transport proto is given, we consider tcp as default.
 	// Defaults to "".
 	FlowCollectorAddr string `yaml:"flowCollectorAddr,omitempty"`
-	// Provide flow export frequency, which is the number of seconds elapsed before flow aggregator exports flow
+	// Provide flow export interval as a duration string. This determines how often the flow aggregator exports flow
 	// records to the flow collector.
-	// Flow export frequency should be greater than or equal to 1s(one second).
-	// Defaults to "60s". Follow the time units of duration.
-	FlowExportFrequency string `yaml:"flowExportFrequency,omitempty"`
+	// 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"`
 }

cmd/flow-aggregator/flow-aggregator.go

@@ -15,9 +15,10 @@
 package main
 
 import (
+	"k8s.io/klog"
+
 	aggregator "github.com/vmware-tanzu/antrea/pkg/flowaggregator"
 	"github.com/vmware-tanzu/antrea/pkg/signals"
-	"k8s.io/klog"
 )
 
 func run(o *Options) error {
@@ -26,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.InitFlowAggregator(o.flowCollectorAddr, o.exportFrequency)
+	flowAggregator := aggregator.InitFlowAggregator(o.flowCollectorAddr, o.exportInterval)
 	go flowAggregator.Run(stopCh)
 	<-stopCh
 	klog.Infof("Stopping flow aggregator")

cmd/flow-aggregator/main.go

@@ -22,10 +22,11 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu/antrea/pkg/log"
-	"github.com/vmware-tanzu/antrea/pkg/version"
 	"k8s.io/component-base/logs"
 	"k8s.io/klog"
+
+	"github.com/vmware-tanzu/antrea/pkg/log"
+	"github.com/vmware-tanzu/antrea/pkg/version"
 )
 
 func main() {