Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: failed to save outputs: verify serviceaccount default:default has necessary privileges #1362

Merged
merged 14 commits into from
May 31, 2019
Merged

Fixed: failed to save outputs: verify serviceaccount default:default has necessary privileges #1362

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
00f08b1
CheckandEstimate implementation
sarabala1979 Apr 4, 2019
e7ac42a
fixed variable rename
sarabala1979 Apr 4, 2019
d956bfc
fixed gofmt
sarabala1979 Apr 5, 2019
be9b3b5
fixed feedbacks
sarabala1979 Apr 5, 2019
0d15503
merge
sarabala1979 Apr 9, 2019
d967df3
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 Apr 9, 2019
4c9b645
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 Apr 10, 2019
c40cc5f
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 Apr 11, 2019
51e2d5f
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 Apr 26, 2019
8713b45
Fixed Issue 983
sarabala1979 May 9, 2019
471ff0a
removed unwated error
sarabala1979 May 9, 2019
afdf279
updated review comments
sarabala1979 May 22, 2019
479d3e4
Refaactor the implementation to write the error message in pod termin…
sarabala1979 May 29, 2019
27845e7
Update executor.go
sarabala1979 May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/argoexec/commands/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package commands

import (
"github.com/argoproj/argo/errors"
"github.com/argoproj/pkg/stats"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -28,12 +29,12 @@ func loadArtifacts() error {
// Download input artifacts
err := wfExecutor.StageFiles()
if err != nil {
wfExecutor.AddError(err)
wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Init container failed to stage the files"))
return err
}
err = wfExecutor.LoadArtifacts()
if err != nil {
wfExecutor.AddError(err)
wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Init container failed to load the artifacts"))
return err
}
return nil
Expand Down
9 changes: 5 additions & 4 deletions cmd/argoexec/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package commands

import (
"encoding/json"
"github.com/argoproj/argo/errors"
"os"

"github.com/argoproj/pkg/cli"
Expand Down Expand Up @@ -66,7 +67,7 @@ func NewRootCommand() *cobra.Command {

func initExecutor() *executor.WorkflowExecutor {
config, err := clientConfig.ClientConfig()
checkErr(err)
checkErr(errors.Wrap(err, errors.CodeInternal, "Failed to initialize client config in Sidecar"))

namespace, _, err := clientConfig.Namespace()
checkErr(err)
Expand All @@ -80,7 +81,7 @@ func initExecutor() *executor.WorkflowExecutor {
}

tmpl, err := executor.LoadTemplate(podAnnotationsPath)
checkErr(err)
checkErr(errors.Wrap(err, errors.CodeInternal, "Failed to load the template"))

var cre executor.ContainerRuntimeExecutor
switch os.Getenv(common.EnvVarContainerRuntimeExecutor) {
Expand All @@ -93,7 +94,7 @@ func initExecutor() *executor.WorkflowExecutor {
default:
cre, err = docker.NewDockerExecutor()
}
checkErr(err)
checkErr(errors.Wrap(err, errors.CodeInternal, "Failed to initialize Executor"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to wrap errors in our own libraries.


wfExecutor := executor.NewExecutor(clientset, podName, namespace, podAnnotationsPath, cre, *tmpl)
yamlBytes, _ := json.Marshal(&wfExecutor.Template)
Expand All @@ -105,6 +106,6 @@ func initExecutor() *executor.WorkflowExecutor {
// checkErr is a convenience function to panic upon error
func checkErr(err error) {
if err != nil {
panic(err.Error())
panic("InitExecutor failed in sidecar. " + err.Error())
}
}
16 changes: 9 additions & 7 deletions cmd/argoexec/commands/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package commands

import (
"github.com/argoproj/argo/errors"
"time"

"github.com/argoproj/pkg/stats"
Expand Down Expand Up @@ -31,40 +32,41 @@ func waitContainer() error {
// Wait for main container to complete
err := wfExecutor.Wait()
if err != nil {
wfExecutor.AddError(err)

wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Wait container failed to wait for main container to complete "))
// do not return here so we can still try to kill sidecars & save outputs
}
err = wfExecutor.KillSidecars()
if err != nil {
wfExecutor.AddError(err)
wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Wait container kill failed"))
// do not return here so we can still try save outputs
}
logArt, err := wfExecutor.SaveLogs()
if err != nil {
wfExecutor.AddError(err)
wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Wait container failed to save the logs"))
return err
}
// Saving output parameters
err = wfExecutor.SaveParameters()
if err != nil {
wfExecutor.AddError(err)
wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Wait container failed to save the parameters"))
return err
}
// Saving output artifacts
err = wfExecutor.SaveArtifacts()
if err != nil {
wfExecutor.AddError(err)
wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Wait container failed to save the artifacts"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to wrap errors coming from our own libraries.

return err
}
// Capture output script result
err = wfExecutor.CaptureScriptResult()
if err != nil {
wfExecutor.AddError(err)
wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Wait container failed to capture the script results"))
return err
}
err = wfExecutor.AnnotateOutputs(logArt)
if err != nil {
wfExecutor.AddError(err)
wfExecutor.AddError(errors.Wrap(err, errors.CodeInternal, " Wait container failed to annotate the outputs"))
return err
}
return nil
Expand Down