Skip to content

Commit

Permalink
Remove merge error
Browse files Browse the repository at this point in the history
Signed-off-by: Ivan Sim <ivan.sim@kasten.io>
  • Loading branch information
ihcsim committed Mar 30, 2022
1 parent a0d1cef commit 40e802b
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions pkg/function/kube_exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import (
"github.com/pkg/errors"

kanister "github.com/kanisterio/kanister/pkg"
"github.com/kanisterio/kanister/pkg/consts"
"github.com/kanisterio/kanister/pkg/field"
"github.com/kanisterio/kanister/pkg/kube"
"github.com/kanisterio/kanister/pkg/output"
"github.com/kanisterio/kanister/pkg/param"
Expand Down Expand Up @@ -92,9 +90,6 @@ func (kef *kubeExecFunc) Exec(ctx context.Context, tp param.TemplateParams, args
if err = Arg(args, KubeExecCommandArg, &cmd); err != nil {
return nil, err
}
ctx = field.Context(ctx, consts.PodNameKey, pod)
_ = field.Context(ctx, consts.ContainerNameKey, container)

if err := kube.ExecAsync(cli, namespace, pod, container, cmd, nil); err != nil {
return nil, err
}
Expand Down

0 comments on commit 40e802b

Please sign in to comment.