Merge pull request #619 from saikat-royc/pd-logs-on-gke

Collect managed pd csi driver logs from node

Author: k8s-ci-robot

test/k8s-integration/driver.go

@@ -91,7 +91,7 @@ func installDriver(platform, goPath, pkgDir, stagingImage, stagingVersion, deplo
 		klog.Infof("Waiting 5 minutes for the driver to start on Linux")
 		time.Sleep(5 * time.Minute)
 	}
-	out, err := exec.Command("kubectl", "describe", "pods", "-n", driverNamespace).CombinedOutput()
+	out, err := exec.Command("kubectl", "describe", "pods", "-n", getDriverNamespace()).CombinedOutput()
 	klog.Infof("describe pods \n %s", string(out))
 
 	if err != nil {
@@ -169,13 +169,12 @@ 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 {
+		if err = podlogs.CopyAllLogs(ctx, client, getDriverNamespace(), out); err != nil {
 			return cancel, fmt.Errorf("failed to start pod logger: %v", err)
 		}
 		return cancel, nil
 	}
 	return nil, nil
-
 }
 
 // mergeArtifacts merges the results of doing multiple gingko runs, taking all junit files
@@ -194,3 +193,10 @@ func mergeArtifacts(subdirectories []string) error {
 	}
 	return MergeJUnit("External Storage", sourceDirs, filepath.Join(artifactsDir, "junit_pdcsi.xml"))
 }
+
+func getDriverNamespace() string {
+	if *useGKEManagedDriver {
+		return managedDriverNamespace
+	}
+	return externalDriverNamespace
+}

test/k8s-integration/main.go

@@ -73,7 +73,8 @@ const (
 	pdImagePlaceholder        = "gke.gcr.io/gcp-compute-persistent-disk-csi-driver"
 	k8sInDockerBuildBinDir    = "_output/dockerized/bin/linux/amd64"
 	k8sOutOfDockerBuildBinDir = "_output/bin"
-	driverNamespace           = "gce-pd-csi-driver"
+	externalDriverNamespace   = "gce-pd-csi-driver"
+	managedDriverNamespace    = "kube-system"
 )
 
 func init() {
@@ -335,7 +336,7 @@ func handle() error {
 			return fmt.Errorf("failed to prepull images: %s, err: %v", out, err)
 		}
 		time.Sleep(10 * time.Minute)
-		out, err = exec.Command("kubectl", "describe", "pods", "-n", driverNamespace).CombinedOutput()
+		out, err = exec.Command("kubectl", "describe", "pods", "-n", getDriverNamespace()).CombinedOutput()
 		klog.Infof("describe pods \n %s", string(out))
 
 		if err != nil {
@@ -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, err := dumpDriverLogs()
+	if err != nil {
+		return fmt.Errorf("failed to start driver logging: %v", err)
 	}
+	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.
@@ -395,7 +396,6 @@ func handle() error {
 	}
 
 	var cloudProviderArgs []string
-	var err error
 	switch *deploymentStrat {
 	case "gke":
 		cloudProviderArgs, err = getGKEKubeTestArgs(*gceZone, *gceRegion, *imageType)