From 3e0423926af105c6c3c9fd6fdf025adff39ac8f6 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Sun, 14 Apr 2019 10:06:05 -0700 Subject: [PATCH] Return aggregate error from rollbackOldManifests --- cmd/kubeadm/app/phases/upgrade/staticpods.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go index ba64fddaad9..7e306c9b33d 100644 --- 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.