Collect managed pd csi driver logs from node

Author: saikat-royc

test/k8s-integration/driver.go

@@ -169,7 +169,11 @@ func dumpDriverLogs() (context.CancelFunc, error) {
 			LogPathPrefix: filepath.Join(artifactsDir, "pd-csi-driver") + "/",
 		}
 		ctx, cancel := context.WithCancel(context.Background())
-		if err = podlogs.CopyAllLogs(ctx, client, driverNamespace, out); err != nil {
+		namespace := driverNamespace
+		if *useGKEManagedDriver {
+			namespace = managedDriverNamespace
+		}
+		if err = podlogs.CopyAllLogs(ctx, client, namespace, out); err != nil {
 			return cancel, fmt.Errorf("failed to start pod logger: %v", err)
 		}
 		return cancel, nil

test/k8s-integration/main.go

@@ -74,6 +74,7 @@ const (
 	k8sInDockerBuildBinDir    = "_output/dockerized/bin/linux/amd64"
 	k8sOutOfDockerBuildBinDir = "_output/bin"
 	driverNamespace           = "gce-pd-csi-driver"
+	managedDriverNamespace    = "kube-system"
 )
 
 func init() {
@@ -357,18 +358,18 @@ func handle() error {
 		if err != nil {
 			return fmt.Errorf("failed to install CSI Driver: %v", err)
 		}
+	}
 
-		// Dump all driver logs to the test artifacts
-		cancel, err := dumpDriverLogs()
-		if err != nil {
-			return fmt.Errorf("failed to start driver logging: %v", err)
-		}
-		defer func() {
-			if cancel != nil {
-				cancel()
-			}
-		}()
+	// Dump all driver logs to the test artifacts
+	cancel, dumpErr := dumpDriverLogs()
+	if dumpErr != nil {
+		return fmt.Errorf("failed to start driver logging: %v", dumpErr)
 	}
+	defer func() {
+		if cancel != nil {
+			cancel()
+		}
+	}()
 
 	// For windows cluster, it has both Windows nodes and Linux nodes. Before triggering the tests, taint Linux nodes
 	// with NoSchedule to avoid test pods being scheduled on Linux. Need to do this step after driver is deployed.