github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Return aggregate error from rollbackOldManifests
This commit is contained in:
Kubernetes Prow Robot 2019-04-15 03:54:23 -07:00 committed by GitHub
commit c09cfb7178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats 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.