Merge pull request kubernetes#39750 from vmware/automated-cherry-pick…

…-of-#36169-kubernetes-release-1.5

Automatic merge from submit-queue

Automated cherry pick of kubernetes#36169

Cherry pick of kubernetes#36169 on release-1.5.

kubernetes#36169: Bad conditional in vSphereLogin function

pkg/cloudprovider/providers/vsphere/vsphere.go

@@ -360,8 +360,11 @@ func vSphereLogin(vs *VSphere, ctx context.Context) error {
 	m := session.NewManager(vs.client.Client)
 	// retrieve client's current session
 	u, err := m.UserSession(ctx)
-	if err == nil && u == nil {
-		// current session is valid
+	if err != nil {
+		glog.Errorf("Error while obtaining user session. err: %q", err)
+		return err
+	}
+	if u != nil {
 		return nil
 	}