remove ExecuteOverSSHEnabled function (#1048)

* remove ExecuteOverSSHEnabled function Signed-off-by: Ramiro Berrelleza <rberrelleza@gmail.com>
okteto · Sep 22, 2020 · a778726 · a778726
1 parent 32a1205
commit a778726
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/cmd/exec.go b/cmd/exec.go
@@ -107,7 +107,7 @@ func executeExec(ctx context.Context, dev *model.Dev, args []string) error {
 		dev.Container = p.Spec.Containers[0].Name
 	}
 
-	if dev.ExecuteOverSSHEnabled() || dev.RemoteModeEnabled() {
+	if dev.RemoteModeEnabled() {
 		log.Infof("executing remote command over SSH")
 		dev.LoadRemote(ssh.GetPublicKey())
 		return ssh.Exec(ctx, dev.RemotePort, true, os.Stdin, os.Stdout, os.Stderr, wrapped)

diff --git a/cmd/init/init.go b/cmd/init/init.go
@@ -205,7 +205,7 @@ func supportsPersistentVolumes(namespace, k8sContext string) bool {
 	log.Debugf("checking persistent volumes support in your cluster...")
 	c, _, currentNamespace, err := k8Client.GetLocal(k8sContext)
 	if err != nil {
-		log.Debugf("couldn't get kubernetes local client: %s", err.Error())
+		log.Infof("couldn't get kubernetes local client: %s", err.Error())
 		return false
 	}
 	if namespace == "" {
@@ -214,7 +214,7 @@ func supportsPersistentVolumes(namespace, k8sContext string) bool {
 
 	ns, err := namespaces.Get(namespace, c)
 	if err != nil {
-		log.Debugf("failed to get the current namespace: %s", err.Error())
+		log.Infof("failed to get the current namespace: %s", err.Error())
 		return false
 	}
 
@@ -224,7 +224,7 @@ func supportsPersistentVolumes(namespace, k8sContext string) bool {
 
 	stClassList, err := c.StorageV1().StorageClasses().List(metav1.ListOptions{})
 	if err != nil {
-		log.Debugf("error getting storage classes: %s", err.Error())
+		log.Infof("error getting storage classes: %s", err.Error())
 		return false
 	}
 
@@ -234,7 +234,8 @@ func supportsPersistentVolumes(namespace, k8sContext string) bool {
 			return true
 		}
 	}
-	log.Debugf("default storage class not found")
+
+	log.Infof("default storage class not found")
 	return false
 }
 

diff --git a/cmd/up/up.go b/cmd/up/up.go
@@ -169,10 +169,6 @@ func loadDevOverrides(dev *model.Dev, namespace, k8sContext string, forcePull bo
 		dev.RemotePort = remote
 	}
 
-	if dev.ExecuteOverSSHEnabled() {
-		log.Info("execute over SSH mode enabled")
-	}
-
 	if dev.RemoteModeEnabled() {
 		if err := sshKeys(); err != nil {
 			return err
@@ -591,7 +587,7 @@ func (up *upContext) devMode(d *appsv1.Deployment, create bool) error {
 }
 
 func (up *upContext) forwards() error {
-	if up.Dev.ExecuteOverSSHEnabled() || up.Dev.RemoteModeEnabled() {
+	if up.Dev.RemoteModeEnabled() {
 		return up.sshForwards()
 	}
 

diff --git a/pkg/model/dev.go b/pkg/model/dev.go
@@ -801,7 +801,9 @@ func (dev *Dev) RemoteModeEnabled() bool {
 		return false
 	}
 
-	if dev.ExecuteOverSSHEnabled() {
+	_, ok := os.LookupEnv("OKTETO_EXECUTE_SSH")
+	if ok {
+		log.Info("execute over SSH mode enabled")
 		return true
 	}
 
@@ -812,12 +814,6 @@ func (dev *Dev) RemoteModeEnabled() bool {
 	return len(dev.Reverse) > 0
 }
 
-// ExecuteOverSSHEnabled returns true if execute over SSH is enabled
-func (dev *Dev) ExecuteOverSSHEnabled() bool {
-	_, ok := os.LookupEnv("OKTETO_EXECUTE_SSH")
-	return ok
-}
-
 // GetKeyName returns the secret key name
 func (s *Secret) GetKeyName() string {
 	return fmt.Sprintf("dev-secret-%s", filepath.Base(s.RemotePath))