diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade.go b/cmd/kubeadm/app/phases/upgrade/postupgrade.go index c05c5f0c039..09ad32e70d8 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade.go @@ -296,26 +296,3 @@ func GetKubeletDir(dryRun bool) (string, error) { } return kubeadmconstants.KubeletRunDirectory, nil } - -// moveFiles moves files from one directory to another. -func moveFiles(files map[string]string) error { - filesToRecover := make(map[string]string, len(files)) - for from, to := range files { - if err := os.Rename(from, to); err != nil { - return rollbackFiles(filesToRecover, err) - } - filesToRecover[to] = from - } - return nil -} - -// rollbackFiles moves the files back to the original directory. -func rollbackFiles(files map[string]string, originalErr error) error { - errs := []error{originalErr} - for from, to := range files { - if err := os.Rename(from, to); err != nil { - errs = append(errs, err) - } - } - return errors.Errorf("couldn't move these files: %v. Got errors: %v", files, errorsutil.NewAggregate(errs)) -} diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go b/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go index cd310301ffc..f090889beb1 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go @@ -25,6 +25,7 @@ import ( "github.com/pkg/errors" + errorsutil "k8s.io/apimachinery/pkg/util/errors" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" "k8s.io/kubernetes/cmd/kubeadm/app/constants" @@ -206,3 +207,26 @@ func (cc *componentConfig) IsUserSupplied() bool { func (cc *componentConfig) SetUserSupplied(userSupplied bool) { cc.userSupplied = userSupplied } + +// moveFiles moves files from one directory to another. +func moveFiles(files map[string]string) error { + filesToRecover := make(map[string]string, len(files)) + for from, to := range files { + if err := os.Rename(from, to); err != nil { + return rollbackFiles(filesToRecover, err) + } + filesToRecover[to] = from + } + return nil +} + +// rollbackFiles moves the files back to the original directory. +func rollbackFiles(files map[string]string, originalErr error) error { + errs := []error{originalErr} + for from, to := range files { + if err := os.Rename(from, to); err != nil { + errs = append(errs, err) + } + } + return errors.Errorf("couldn't move these files: %v. Got errors: %v", files, errorsutil.NewAggregate(errs)) +}