Skip to content

Commit

Permalink
fixup! Apply ssh askpass flow for the workspace container
Browse files Browse the repository at this point in the history
Signed-off-by: ivinokur <[email protected]>
  • Loading branch information
vinokurig committed Aug 16, 2024
1 parent d829884 commit 65df1ba
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 3 additions & 2 deletions controllers/workspace/devworkspace_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ package controllers
import (
"context"
"fmt"
"github.com/devfile/devworkspace-operator/pkg/library/ssh"
"strconv"
"strings"
"time"

"github.com/devfile/devworkspace-operator/pkg/library/ssh"

devfilevalidation "github.com/devfile/api/v2/pkg/validation"
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/controllers/workspace/metrics"
Expand Down Expand Up @@ -282,7 +283,7 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request

err = ssh.AddSshAgentPostStartEvent(&workspace.Spec.Template)
if err != nil {
return r.failWorkspace(workspace, "hello", metrics.ReasonWorkspaceEngineFailure, reqLogger, &reconcileStatus), nil
return r.failWorkspace(workspace, "Failed to add ssh-agent post start event", metrics.ReasonWorkspaceEngineFailure, reqLogger, &reconcileStatus), nil
}

reconcileStatus.setConditionTrue(conditions.DevWorkspaceResolved, "Resolved plugins and parents from DevWorkspace")
Expand Down
3 changes: 2 additions & 1 deletion pkg/library/env/workspaceenv.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ package env

import (
"fmt"
"github.com/devfile/devworkspace-operator/pkg/provision/automount"
"os"

"github.com/devfile/devworkspace-operator/pkg/provision/automount"

dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
devfileConstants "github.com/devfile/devworkspace-operator/pkg/library/constants"
Expand Down
1 change: 1 addition & 0 deletions pkg/provision/automount/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package automount

import (
_ "embed"

"github.com/devfile/devworkspace-operator/pkg/constants"
"github.com/devfile/devworkspace-operator/pkg/dwerrors"
"github.com/devfile/devworkspace-operator/pkg/provision/sync"
Expand Down

0 comments on commit 65df1ba

Please sign in to comment.