Merge pull request #1505 from fisherxu/automated-cherry-pick-of-#1494-upstream-release-1.2

Automated cherry pick of #1494: remove useless validation in cloudcore

3 files changed, 6 insertions, 19 deletions

diff --git a/cloud/pkg/cloudhub/servers/udsserver/uds.go b/cloud/pkg/cloudhub/servers/udsserver/uds.go
index 385d76d10..3edc423c9 100644
--- a/cloud/pkg/cloudhub/servers/udsserver/uds.go
+++ b/cloud/pkg/cloudhub/servers/udsserver/uds.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"path/filepath"
 	"strings"
 
 	"k8s.io/klog"
@@ -63,16 +62,6 @@ func (us *UnixDomainSocket) StartServer() error {
 		}
 	}
 
-	dir, err := filepath.Abs(filepath.Dir(addr))
-	if err != nil {
-		klog.Errorf("invalid dir of addr found: %v", err)
-	}
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		if err := os.Mkdir(dir, 0755); err != nil {
-			klog.Errorf("failed to create addr dir: %v", err)
-		}
-	}
-
 	// Listen
 	listener, err := net.Listen(proto, addr)
 	if err != nil {
diff --git a/pkg/apis/cloudcore/v1alpha1/validation/validation.go b/pkg/apis/cloudcore/v1alpha1/validation/validation.go
index 1af161539..3f0240b00 100644
--- a/pkg/apis/cloudcore/v1alpha1/validation/validation.go
+++ b/pkg/apis/cloudcore/v1alpha1/validation/validation.go
@@ -18,6 +18,7 @@ package validation
 
 import (
 	"fmt"
+	"os"
 	"path"
 	"strings"
 
@@ -85,9 +86,11 @@ func ValidateModuleCloudHub(c cloudconfig.CloudHub) field.ErrorList {
 	}
 	s := strings.SplitN(c.UnixSocket.Address, "://", 2)
 	if len(s) > 1 && !utilvalidation.FileIsExist(path.Dir(s[1])) {
-		allErrs = append(allErrs, field.Invalid(field.NewPath("address"),
-			c.UnixSocket.Address, fmt.Sprintf("unixSocketAddress %v dir %v not exist , need create it",
-				c.UnixSocket.Address, path.Dir(s[1]))))
+		if err := os.MkdirAll(path.Dir(s[1]), os.ModePerm); err != nil {
+			allErrs = append(allErrs, field.Invalid(field.NewPath("address"),
+				c.UnixSocket.Address, fmt.Sprintf("create unixSocketAddress %v dir %v error: %v",
+					c.UnixSocket.Address, path.Dir(s[1]), err)))
+		}
 	}
 	return allErrs
 }
diff --git a/tests/e2e/scripts/execute.sh b/tests/e2e/scripts/execute.sh
index 6e2f2f41d..80ffefd6f 100755
--- a/tests/e2e/scripts/execute.sh
+++ b/tests/e2e/scripts/execute.sh
@@ -19,15 +19,10 @@ cd $workdir
 
 curpath=$PWD
 echo $PWD
-VAR_KUBEEDGE_DIR="/var/lib/kubeedge/"
 
 go get github.com/onsi/ginkgo/ginkgo
 sudo cp $GOPATH/bin/ginkgo /usr/bin/
 
-if [ ! -d ${VAR_KUBEEDGE_DIR} ]; then
-  sudo mkdir -p ${VAR_KUBEEDGE_DIR} && sudo chown $USER:$USER ${VAR_KUBEEDGE_DIR}
-fi
-
 bash ${curpath}/tests/e2e/scripts/cleanup.sh deployment
 bash ${curpath}/tests/e2e/scripts/cleanup.sh edgesite
 bash ${curpath}/tests/e2e/scripts/cleanup.sh device_crd