weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

only print Helm install output on error

Browse Source 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
This commit is contained in:
Tim Ramlot 2022-08-04 10:21:27 +00:00
parent 501277bb62
commit a8743628a4
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/e2e/framework/addon/chart/addon.go
View File

@ -146,10 +146,22 @@ func (c *Chart) runInstall() error {
}
cmd := c.buildHelmCmd(args...)
err := cmd.Run()
cmd.Stdout = nil
out, err := cmd.StdoutPipe()
if err != nil {
return err
}
defer out.Close()
err = cmd.Run()
if err != nil {
_, err2 := io.Copy(os.Stdout, out)
if err2 != nil {
return fmt.Errorf("cmd.Run: %v: io.Copy: %v", err, err2)
}
return fmt.Errorf("cmd.Run: %v", err)
}
return nil
}
@ -189,10 +201,23 @@ func (c *Chart) getHelmVersion() (string, error) {
// Deprovision the deployed instance of tiller-deploy
func (c *Chart) Deprovision() error {
err := c.buildHelmCmd("delete", "--namespace", c.Namespace, c.ReleaseName).Run()
cmd := c.buildHelmCmd("delete", "--namespace", c.Namespace, c.ReleaseName)
cmd.Stdout = nil
out, err := cmd.StdoutPipe()
if err != nil {
return err
}
defer out.Close()
err = cmd.Run()
if err != nil {
_, err2 := io.Copy(os.Stdout, out)
if err2 != nil {
return fmt.Errorf("cmd.Run: %v: io.Copy: %v", err, err2)
}
// Ignore deprovisioning errors
// TODO: only ignore failed to delete because it doesn't exist errors
// TODO: only ignore "failed to delete because it doesn't exist" errors
return nil
}