Execute start hook if defined in cloudbin image (#1552)

Signed-off-by: Pablo Chico de Guzman <pchico83@gmail.com>
okteto · May 20, 2021 · e27561d · e27561d
1 parent 92b1899
commit e27561d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/cmd/up/activate.go b/cmd/up/activate.go
@@ -127,8 +127,9 @@ func (up *upContext) activate(autoDeploy, build bool) error {
 		log.Debugf("clean command output: %s", output)
 
 		outByCommand := strings.Split(strings.TrimSpace(output), "\n")
-		if len(outByCommand) >= 2 {
-			version, watches := outByCommand[0], outByCommand[1]
+		var version, watches, hook string
+		if len(outByCommand) >= 3 {
+			version, watches, hook = outByCommand[0], outByCommand[1], outByCommand[2]
 
 			if isWatchesConfigurationTooLow(watches) {
 				folder := config.GetNamespaceHome(up.Dev.Namespace)
@@ -147,6 +148,7 @@ func (up *upContext) activate(autoDeploy, build bool) error {
 				log.Yellow("Please consider upgrading your init container image %s with the content of %s", up.Dev.InitContainer.Image, model.OktetoBinImageTag)
 				log.Infof("Using init image %s instead of default init image (%s)", up.Dev.InitContainer.Image, model.OktetoBinImageTag)
 			}
+
 		}
 		divertURL := ""
 		if up.Dev.Divert != nil {
@@ -160,7 +162,14 @@ func (up *upContext) activate(autoDeploy, build bool) error {
 			}
 		}
 		printDisplayContext(up.Dev, divertURL)
-		up.CommandResult <- up.runCommand(ctx)
+		if hook == "yes" {
+			log.Information("Running start.sh hook...")
+			if err := up.runCommand(ctx, []string{"/var/okteto/cloudbin/start.sh"}); err != nil {
+				up.CommandResult <- err
+				return
+			}
+		}
+		up.CommandResult <- up.runCommand(ctx, up.Dev.Command.Values)
 	}()
 	prevError := up.waitUntilExitOrInterrupt()
 

diff --git a/cmd/up/exec.go b/cmd/up/exec.go
@@ -19,7 +19,7 @@ func (up *upContext) cleanCommand(ctx context.Context) {
 	in := strings.NewReader("\n")
 	var out bytes.Buffer
 
-	cmd := "cat /var/okteto/bin/version.txt; cat /proc/sys/fs/inotify/max_user_watches; /var/okteto/bin/clean >/dev/null 2>&1"
+	cmd := "cat /var/okteto/bin/version.txt; cat /proc/sys/fs/inotify/max_user_watches; [ -f /var/okteto/cloudbin/start.sh ] && echo yes || echo no; /var/okteto/bin/clean >/dev/null 2>&1"
 
 	err := exec.Exec(
 		ctx,
@@ -42,14 +42,14 @@ func (up *upContext) cleanCommand(ctx context.Context) {
 	up.cleaned <- out.String()
 }
 
-func (up *upContext) runCommand(ctx context.Context) error {
+func (up *upContext) runCommand(ctx context.Context, cmd []string) error {
 	log.Infof("starting remote command")
 	if err := config.UpdateStateFile(up.Dev, config.Ready); err != nil {
 		return err
 	}
 
 	if up.Dev.RemoteModeEnabled() {
-		return ssh.Exec(ctx, up.Dev.Interface, up.Dev.RemotePort, true, os.Stdin, os.Stdout, os.Stderr, up.Dev.Command.Values)
+		return ssh.Exec(ctx, up.Dev.Interface, up.Dev.RemotePort, true, os.Stdin, os.Stdout, os.Stderr, cmd)
 	}
 
 	return exec.Exec(
@@ -63,7 +63,7 @@ func (up *upContext) runCommand(ctx context.Context) error {
 		os.Stdin,
 		os.Stdout,
 		os.Stderr,
-		up.Dev.Command.Values,
+		cmd,
 	)
 }
 

diff --git a/integration/stacks_test.go b/integration/stacks_test.go
@@ -217,7 +217,7 @@ func TestCompose(t *testing.T) {
 	if err := deployStack(ctx, oktetoPath, "docker-compose.yml", composeGitFolder); err != nil {
 		t.Fatal(err)
 	}
-	log.Println("Stack has been redeployed succesfully")
+	log.Println("Stack has been redeployed successfully")
 
 	if err := destroyStack(ctx, oktetoPath, "docker-compose.yml", composeGitFolder); err != nil {
 		t.Fatal(err)