automatically enable SSH Exec mode for remote (#864)

Signed-off-by: Ramiro Berrelleza <rberrelleza@gmail.com>
okteto · May 6, 2020 · c432046 · c432046
1 parent 7f45b09
commit c432046
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmd/exec.go b/cmd/exec.go
@@ -82,7 +82,7 @@ func executeExec(ctx context.Context, dev *model.Dev, args []string) error {
 	wrapped := []string{"sh", "-c"}
 	wrapped = append(wrapped, args...)
 
-	if dev.ExecuteOverSSHEnabled() {
+	if dev.ExecuteOverSSHEnabled() || dev.RemoteModeEnabled() {
 		log.Infof("executing remote command over SSH")
 		return ssh.Exec(ctx, dev.RemotePort, true, os.Stdin, os.Stdout, os.Stderr, wrapped)
 	}

diff --git a/cmd/up.go b/cmd/up.go
@@ -234,7 +234,7 @@ func (up *UpContext) Activate(autoDeploy, build, resetSyncthing bool) {
 	}
 
 	if err := createPIDFile(up.Dev.Namespace, up.Dev.Name); err != nil {
-		log.Infof("failed to create pid file for %s - %s", up.Dev.Namespace, up.Dev.Name)
+		log.Infof("failed to create pid file for %s - %s: %s", up.Dev.Namespace, up.Dev.Name, err)
 		up.Exit <- fmt.Errorf("couldn't create pid file for %s - %s", up.Dev.Namespace, up.Dev.Name)
 		return
 	}
@@ -579,7 +579,7 @@ func (up *UpContext) devMode(d *appsv1.Deployment, create bool) error {
 }
 
 func (up *UpContext) forwards() error {
-	if up.Dev.ExecuteOverSSHEnabled() {
+	if up.Dev.ExecuteOverSSHEnabled() || up.Dev.RemoteModeEnabled() {
 		return up.sshForwards()
 	}
 
@@ -722,7 +722,7 @@ func (up *UpContext) startSyncthing(resetSyncthing bool) error {
 		return err
 	}
 
-	return up.Sy.WaitForScanning(up.Context, up.Dev, false);
+	return up.Sy.WaitForScanning(up.Context, up.Dev, false)
 
 }
 
@@ -811,7 +811,7 @@ func (up *UpContext) runCommand() error {
 	log.Infof("starting remote command")
 	up.updateStateFile(ready)
 
-	if up.Dev.ExecuteOverSSHEnabled() {
+	if up.Dev.ExecuteOverSSHEnabled() || up.Dev.RemoteModeEnabled() {
 		return ssh.Exec(up.Context, up.Dev.RemotePort, true, os.Stdin, os.Stdout, os.Stderr, up.Dev.Command)
 	}