added BUILD; review comments

test/e2e/storage/BUILD

@@ -58,6 +58,7 @@ go_library(
         "//vendor/google.golang.org/api/googleapi:go_default_library",
         "//vendor/k8s.io/api/batch/v1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/api/policy/v1beta1:go_default_library",
         "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
         "//vendor/k8s.io/api/storage/v1:go_default_library",
         "//vendor/k8s.io/api/storage/v1beta1:go_default_library",

test/e2e/storage/pd.go

@@ -358,7 +358,11 @@ var _ = SIGDescribe("Pod Disks", func() {
 						}
 						By("defer: verify the number of ready nodes")
 						numNodes := countReadyNodes(cs, host0Name)
-						Expect(numNodes).To(Equal(origNodeCnt), fmt.Sprintf("defer: Requires current node count (%d) to return to original node count (%d)", numNodes, origNodeCnt))
+						// if this defer is reached due to an Expect then nested
+						// Expects are lost, so use Failf here
+						if numNodes != origNodeCnt {
+							framework.Failf("defer: Requires current node count (%d) to return to original node count (%d)", numNodes, origNodeCnt)
+						}
 					}
 				}()