Merge pull request kubernetes#76566 from tedyu/adm-rollback-err

k8s-ci-robot · web-flow · commit c09cfb717851 · 2019-04-15T03:54:23.000-07:00
Return aggregate error from rollbackOldManifests
diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go
@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/version"
 	clientset "k8s.io/client-go/kubernetes"
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
@@ -467,7 +468,8 @@ func rollbackOldManifests(oldManifests map[string]string, origErr error, pathMgr
 		}
 	}
 	// Let the user know there were problems, but we tried to recover
-	return errors.New("couldn't upgrade control plane. kubeadm has tried to recover everything into the earlier state. Errors faced")
+	return errors.Wrap(utilerrors.NewAggregate(errs),
+		"couldn't upgrade control plane. kubeadm has tried to recover everything into the earlier state. Errors faced")
 }
 
 // rollbackEtcdData rolls back the content of etcd folder if something went wrong.

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`"time"`
`24`	`24`
`25`	`25`	`"github.com/pkg/errors"`
	`26`	`+ utilerrors "k8s.io/apimachinery/pkg/util/errors"`
`26`	`27`	`"k8s.io/apimachinery/pkg/util/version"`
`27`	`28`	`clientset "k8s.io/client-go/kubernetes"`
`28`	`29`	`kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"`
`@@ -467,7 +468,8 @@ func rollbackOldManifests(oldManifests map[string]string, origErr error, pathMgr`
`467`	`468`	`}`
`468`	`469`	`}`
`469`	`470`	`// Let the user know there were problems, but we tried to recover`
`470`		`- return errors.New("couldn't upgrade control plane. kubeadm has tried to recover everything into the earlier state. Errors faced")`
	`471`	`+ return errors.Wrap(utilerrors.NewAggregate(errs),`
	`472`	`+ "couldn't upgrade control plane. kubeadm has tried to recover everything into the earlier state. Errors faced")`
`471`	`473`	`}`
`472`	`474`
`473`	`475`	`// rollbackEtcdData rolls back the content of etcd folder if something went wrong.`