Merge pull request #620 from mattcary/wait

Wait on driver deployment rather than sleep

Author: k8s-ci-robot

deploy/kubernetes/wait-for-driver.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# This script waits for the deployments from ./deploy-driver.sh to be ready.
+
+print_usage()
+{
+    printf "wait-for-driver.sh [--windows]\n"
+    printf "\t--windows: wait on the windows deployment rather than linux"
+    echo
+}
+
+node_daemonset=csi-gce-pd-node
+while [[ -n "${1-}" ]]; do
+  case $1 in
+    --windows )    shift
+                   node_daemonset=csi-gce-pd-node-win
+                   ;;
+    -h | --help )  print_usage
+                   exit 1
+                   ;;
+    * )            print_usage
+                   exit 1
+                   ;;
+  esac
+done
+
+kubectl wait -n gce-pd-csi-driver deployment csi-gce-pd-controller --for condition=available
+
+retries=90
+while [[ $retries -ge 0 ]];do
+    ready=$(kubectl -n gce-pd-csi-driver get daemonset "${node_daemonset}" -o jsonpath="{.status.numberReady}")
+    required=$(kubectl -n gce-pd-csi-driver get daemonset "${node_daemonset}" -o jsonpath="{.status.desiredNumberScheduled}")
+    if [[ $ready -eq $required ]];then
+        echo "Daemonset $node_daemonset found"
+        exit 0
+    fi
+    ((retries--))
+    sleep 10s
+done
+echo "Timeout waiting for node daemonset $node_daemonset"
+exit -1
+

test/k8s-integration/driver.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"time"
 
 	"k8s.io/klog"
 	"k8s.io/kubernetes/test/e2e/framework/podlogs"
@@ -77,19 +76,27 @@ func installDriver(platform, goPath, pkgDir, stagingImage, stagingVersion, deplo
 	deployEnv = append(deployEnv,
 		fmt.Sprintf("GOPATH=%s", goPath),
 		fmt.Sprintf("GCE_PD_DRIVER_VERSION=%s", deployOverlayName))
-	deployCmd.Env = append(os.Environ(), deployEnv...)
+	deployEnv = append(os.Environ(), deployEnv...)
+	deployCmd.Env = deployEnv
 	err := runCommand("Deploying driver", deployCmd)
 	if err != nil {
-		return fmt.Errorf("failed to deploy driver: %v", err)
+		return fmt.Errorf("failed to deploy driver: %w", err)
+	}
+
+	waitScript := filepath.Join(pkgDir, "deploy", "kubernetes", "wait-for-driver.sh")
+	waitCmd := exec.Command(waitScript)
+	waitCmd.Env = deployEnv
+	err = runCommand("Waiting for driver to start", waitCmd)
+	if err != nil {
+		return fmt.Errorf("driver failed to come up: %w", err)
 	}
-	klog.Infof("Deploying driver")
-	// TODO (#139): wait for driver to be running
 	if platform == "windows" {
-		klog.Infof("Waiting 15 minutes for the driver to start on Windows")
-		time.Sleep(15 * time.Minute)
-	} else {
-		klog.Infof("Waiting 5 minutes for the driver to start on Linux")
-		time.Sleep(5 * time.Minute)
+		waitCmd = exec.Command(waitScript, "--windows")
+		waitCmd.Env = deployEnv
+		err = runCommand("Waiting for windows deployment to start", waitCmd)
+		if err != nil {
+			return fmt.Errorf("Windows deployment failed to come up: %w", err)
+		}
 	}
 	out, err := exec.Command("kubectl", "describe", "pods", "-n", getDriverNamespace()).CombinedOutput()
 	klog.Infof("describe pods \n %s", string(out))