Addressed comments with Table and datasources changes

Signed-off-by: Tushar Tathgur <[email protected]>
antrea-io · Jul 7, 2023 · c76ecaf · c76ecaf
1 parent d9a928c
commit c76ecaf
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 27 deletions.
diff --git a/build/charts/theia/provisioning/datasources/migrators/000005_0-5-0.down.sql b/build/charts/theia/provisioning/datasources/migrators/000005_0-5-0.down.sql
diff --git a/build/charts/theia/provisioning/datasources/migrators/000005_0-5-0.up.sql b/build/charts/theia/provisioning/datasources/migrators/000005_0-5-0.up.sql
diff --git a/build/charts/theia/provisioning/datasources/migrators/000005_0-6-0.down.sql b/build/charts/theia/provisioning/datasources/migrators/000005_0-6-0.down.sql
@@ -198,3 +198,17 @@ ALTER TABLE flows
 ALTER TABLE flows_local
     DROP COLUMN egressName,
     DROP COLUMN egressIP;
+ALTER TABLE tadetector
+    DROP COLUMN podNamespace;
+    DROP COLUMN podLabels;
+    DROP COLUMN destinationServicePortName;
+    DROP COLUMN aggType;
+    DROP COLUMN direction;
+    DROP COLUMN podName;
+ALTER TABLE tadetector_local
+    DROP COLUMN podNamespace;
+    DROP COLUMN podLabels;
+    DROP COLUMN destinationServicePortName;
+    DROP COLUMN aggType;
+    DROP COLUMN direction;
+    DROP COLUMN podName;
diff --git a/build/charts/theia/provisioning/datasources/migrators/000005_0-6-0.up.sql b/build/charts/theia/provisioning/datasources/migrators/000005_0-6-0.up.sql
@@ -137,3 +137,17 @@ ALTER TABLE flows
 ALTER TABLE flows_local
     ADD COLUMN egressName String,
     ADD COLUMN egressIP String;
+ALTER TABLE tadetector
+    ADD COLUMN podNamespace;
+    ADD COLUMN podLabels;
+    ADD COLUMN destinationServicePortName;
+    ADD COLUMN aggType;
+    ADD COLUMN direction;
+    ADD COLUMN podName;
+ALTER TABLE tadetector_local
+    ADD COLUMN podNamespace;
+    ADD COLUMN podLabels;
+    ADD COLUMN destinationServicePortName;
+    ADD COLUMN aggType;
+    ADD COLUMN direction;
+    ADD COLUMN podName;
diff --git a/build/yamls/flow-visibility.yml b/build/yamls/flow-visibility.yml
@@ -589,6 +589,20 @@ data:
     ALTER TABLE flows_local
         DROP COLUMN egressName,
         DROP COLUMN egressIP;
+    ALTER TABLE tadetector
+        DROP COLUMN podNamespace;
+        DROP COLUMN podLabels;
+        DROP COLUMN destinationServicePortName;
+        DROP COLUMN aggType;
+        DROP COLUMN direction;
+        DROP COLUMN podName;
+    ALTER TABLE tadetector_local
+        DROP COLUMN podNamespace;
+        DROP COLUMN podLabels;
+        DROP COLUMN destinationServicePortName;
+        DROP COLUMN aggType;
+        DROP COLUMN direction;
+        DROP COLUMN podName;
   000005_0-6-0.up.sql: |
     -- Create underlying tables for Materialized Views to attach data
     CREATE TABLE IF NOT EXISTS pod_view_table_local (
@@ -729,6 +743,20 @@ data:
     ALTER TABLE flows_local
         ADD COLUMN egressName String,
         ADD COLUMN egressIP String;
+    ALTER TABLE tadetector
+        ADD COLUMN podNamespace;
+        ADD COLUMN podLabels;
+        ADD COLUMN destinationServicePortName;
+        ADD COLUMN aggType;
+        ADD COLUMN direction;
+        ADD COLUMN podName;
+    ALTER TABLE tadetector_local
+        ADD COLUMN podNamespace;
+        ADD COLUMN podLabels;
+        ADD COLUMN destinationServicePortName;
+        ADD COLUMN aggType;
+        ADD COLUMN direction;
+        ADD COLUMN podName;
   create_table.sh: |
     #!/usr/bin/env bash
 

diff --git a/ci/kind/test-upgrade-theia.sh b/ci/kind/test-upgrade-theia.sh
@@ -255,7 +255,7 @@ popd
 rm -rf $TMP_THEIA_DIR
 
 rc=0
-go test -v -run=TestUpgrade antrea.io/theia/test/e2e -provider=kind --logs-export-dir=$ANTREA_LOG_DIR --upgrade.toVersion=$CURRENT_VERSION --upgrade.fromVersion=$THEIA_FROM_TAG || rc=$?
+go test -v -timeout=15m -run=TestUpgrade antrea.io/theia/test/e2e -provider=kind --logs-export-dir=$ANTREA_LOG_DIR --upgrade.toVersion=$CURRENT_VERSION --upgrade.fromVersion=$THEIA_FROM_TAG || rc=$?
 
 $THIS_DIR/kind-setup.sh destroy kind
 

diff --git a/test/e2e/framework.go b/test/e2e/framework.go
@@ -1303,6 +1303,8 @@ func (data *TestData) waitForClickHousePod() error {
 	// which requires more time to make sure that ClickHouse Pod is ready.
 	err := wait.Poll(defaultInterval, defaultTimeout*4, func() (bool, error) {
 		clickHouseStatefulSetName := fmt.Sprintf("%s-0-0", clickHousePodNamePrefix)
+		// _, stdout, _, _ := data.provider.RunCommandOnNode(controlPlaneNodeName(), fmt.Sprintf("kubectl -n %s describe pod %s", flowVisibilityNamespace, clickHousePodName))
+		// fmt.Printf("TUSHAR kubectl describe pod output: %v", stdout)
 		ss, err := data.clientset.AppsV1().StatefulSets(flowVisibilityNamespace).Get(context.TODO(), clickHouseStatefulSetName, metav1.GetOptions{})
 		if err != nil {
 			return false, fmt.Errorf("error when getting ClickHouse statefulset: %v", err)