Merge pull request kubernetes#64829 from dixudx/e2e_hostpath_type

fix bug on checking non directory HostPathType and add e2e tests for HostPathType

Author: k8s-ci-robot

pkg/volume/hostpath/host_path.go

@@ -370,7 +370,11 @@ func (ftc *fileTypeChecker) IsFile() bool {
 	if !ftc.Exists() {
 		return false
 	}
-	return !ftc.IsDir()
+	pathType, err := ftc.hu.GetFileType(ftc.path)
+	if err != nil {
+		return false
+	}
+	return string(pathType) == string(v1.HostPathFile)
 }
 
 func (ftc *fileTypeChecker) MakeFile() error {

pkg/volume/hostpath/host_path_test.go

@@ -447,7 +447,7 @@ func TestOSFileTypeChecker(t *testing.T) {
 			if oftc.IsDir() {
 				t.Errorf("[%d: %q] expected socket file, got unexpected folder: %s", i, tc.name, path)
 			}
-			if !oftc.IsFile() {
+			if oftc.IsFile() {
 				t.Errorf("[%d: %q] expected socket file, got unexpected file: %s", i, tc.name, path)
 			}
 			if oftc.IsBlock() {
@@ -465,7 +465,7 @@ func TestOSFileTypeChecker(t *testing.T) {
 			if oftc.IsDir() {
 				t.Errorf("[%d: %q] expected character device, got unexpected folder: %s", i, tc.name, path)
 			}
-			if !oftc.IsFile() {
+			if oftc.IsFile() {
 				t.Errorf("[%d: %q] expected character device, got unexpected file: %s", i, tc.name, path)
 			}
 			if oftc.IsSocket() {
@@ -483,7 +483,7 @@ func TestOSFileTypeChecker(t *testing.T) {
 			if oftc.IsDir() {
 				t.Errorf("[%d: %q] expected block device, got unexpected folder: %s", i, tc.name, path)
 			}
-			if !oftc.IsFile() {
+			if oftc.IsFile() {
 				t.Errorf("[%d: %q] expected block device, got unexpected file: %s", i, tc.name, path)
 			}
 			if oftc.IsSocket() {

test/e2e/storage/BUILD

@@ -12,6 +12,7 @@ go_library(
         "flexvolume_mounted_volume_resize.go",
         "flexvolume_online_resize.go",
         "generic_persistent_volume-disruptive.go",
+        "host_path_type.go",
         "in_tree_volumes.go",
         "mounted_volume_resize.go",
         "nfs_persistent_volume-disruptive.go",
@@ -35,6 +36,7 @@ go_library(
         "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/apis/storage/v1/util:go_default_library",
         "//pkg/client/conditions:go_default_library",
+        "//pkg/kubelet/events:go_default_library",
         "//pkg/kubelet/metrics:go_default_library",
         "//pkg/util/slice:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -47,6 +49,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
@@ -66,6 +69,7 @@ go_library(
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/auth:go_default_library",
         "//test/e2e/framework/deployment:go_default_library",
+        "//test/e2e/framework/events:go_default_library",
         "//test/e2e/framework/kubectl:go_default_library",
         "//test/e2e/framework/kubesystem:go_default_library",
         "//test/e2e/framework/metrics:go_default_library",