Address comments

Signed-off-by: Yanjun Zhou <zhouya@vmware.com>
antrea-io · Mar 9, 2022 · f93ae37 · f93ae37
1 parent 3dbc0d5
commit f93ae37
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -183,9 +183,23 @@ jobs:
         echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         docker push antrea/flow-aggregator:latest
 
+  check-clickhouse-monitor-changes:
+    name: Check whether flow-visibility-clickhouse-monitor image need to be built based on diff
+    runs-on: [ubuntu-latest]
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - uses: antrea-io/has-changes@v1
+      id: check_diff
+      with:
+        args: build/yamls/* ci/* cmd/* docs/* hack/* multicluster/* pkg/* test/* third_party/* plugins/octant/* plugins/grafana-sankey-plugin/* *.md
+    outputs:
+      has_changes: ${{ steps.check_diff.outputs.has_changes }}
+
   build-flow-visibility-clickhouse-monitor:
-    needs: check-changes
-    if: ${{ needs.check-changes.outputs.has_changes == 'yes' || github.event_name == 'push' }}
+    needs: check-clickhouse-monitor-changes
+    if: ${{ needs.check-clickhouse-monitor-changes.outputs.has_changes == 'yes' || github.event_name == 'push' }}
     runs-on: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v2

diff --git a/build/yamls/flow-visibility.yml b/build/yamls/flow-visibility.yml
@@ -4966,7 +4966,9 @@ spec:
             - name: MV_NAMES
               value: default.flows_pod_view default.flows_node_view default.flows_policy_view
             - name: NAMESPACE
-              value: flow-visibility
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: MONITOR_LABEL
               value: app=clickhouse-monitor
             image: projects.registry.vmware.com/antrea/flow-visibility-clickhouse-monitor:latest

diff --git a/build/yamls/flow-visibility/base/clickhouse.yml b/build/yamls/flow-visibility/base/clickhouse.yml
@@ -129,7 +129,9 @@ spec:
               - name: MV_NAMES
                 value: "default.flows_pod_view default.flows_node_view default.flows_policy_view"
               - name: NAMESPACE
-                value: "flow-visibility"
+                valueFrom:
+                  fieldRef:
+                    fieldPath: metadata.namespace
               - name: MONITOR_LABEL
                 value: "app=clickhouse-monitor"
           restartPolicy: OnFailure
diff --git a/plugins/flow-visibility/clickhouse-monitor/main.go b/plugins/flow-visibility/clickhouse-monitor/main.go
@@ -98,13 +98,13 @@ func skipRound() bool {
 	// reads the number of rounds requires to be skipped
 	logs := strings.Split(logString, "skipRoundsNum=")
 	if len(logs) != 2 {
-		klog.ErrorS(nil, "Error in finding number of rounds")
+		klog.ErrorS(nil, "Error when finding number of rounds")
 		return false
 	}
 	lines := strings.Split(logs[1], "\n")
 	remainingRoundsNum, convErr := strconv.Atoi(lines[0])
 	if convErr != nil {
-		klog.ErrorS(convErr, "Error in finding last monitor job")
+		klog.ErrorS(convErr, "Error when finding last monitor job")
 		return false
 	}
 	if remainingRoundsNum > 0 {
@@ -123,12 +123,12 @@ func getPodLogs() (string, error) {
 		LabelSelector: monitorLabel,
 	}
 	if err != nil {
-		return logString, fmt.Errorf("error in getting config: %v", err)
+		return logString, fmt.Errorf("error when getting config: %v", err)
 	}
 	// creates the clientset
 	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
-		return logString, fmt.Errorf("error in getting access to K8S: %v", err)
+		return logString, fmt.Errorf("error when getting access to K8S: %v", err)
 	}
 	// gets Clickhouse monitor pod
 	pods, err := clientset.CoreV1().Pods(namespace).List(context.TODO(), listOptions)
@@ -141,14 +141,14 @@ func getPodLogs() (string, error) {
 			req := clientset.CoreV1().Pods(namespace).GetLogs(pod.Name, &podLogOpts)
 			podLogs, err := req.Stream(context.TODO())
 			if err != nil {
-				return logString, fmt.Errorf("error in opening stream: %v", err)
+				return logString, fmt.Errorf("error when opening stream: %v", err)
 			}
 			defer podLogs.Close()
 
 			buf := new(bytes.Buffer)
 			_, err = io.Copy(buf, podLogs)
 			if err != nil {
-				return logString, fmt.Errorf("error in copy information from podLogs to buf: %v", err)
+				return logString, fmt.Errorf("error when copying information from podLogs to buf: %v", err)
 			}
 			logString := buf.String()
 			return logString, nil