github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return aggregate error from rollbackOldManifests

Browse Source
This commit is contained in:
Ted Yu
2019-04-14 10:06:05 -07:00
committed by Ted Yu
parent 8c4651cc41
commit 3e0423926a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@@ -23,6 +23,7 @@ import (
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/version"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" 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 // 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. // rollbackEtcdData rolls back the content of etcd folder if something went wrong.