restore k0s.yaml from backup to current directory

Signed-off-by: Karen Almog <kalmog@mirantis.com>

Author: Karen Almog

pkg/backup/config.go

@@ -11,11 +11,14 @@ import (
 )
 
 type configurationStep struct {
-	path string
+	path       string
+	backupTime string
 }
 
-func newConfigurationStep(path string) *configurationStep {
-	return &configurationStep{path: path}
+func newConfigurationStep(path string, archivePath string) *configurationStep {
+	return &configurationStep{
+		path:       path,
+		backupTime: getArchiveTimestamp(archivePath)}
 }
 
 func (c configurationStep) Name() string {
@@ -42,7 +45,13 @@ func (c configurationStep) Restore(restoreFrom, restoreTo string) error {
 		return nil
 	}
 	logrus.Infof("Previously used k0s.yaml saved under the data directory `%s`", restoreTo)
-	objectPathInRestored := path.Join(restoreTo, "k0s.yaml")
+	cwd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+	restoredFileName := fmt.Sprintf("k0s_%s.yaml", c.backupTime)
+	objectPathInRestored := path.Join(cwd, restoredFileName)
+
 	logrus.Infof("restoring from `%s` to `%s`", objectPathInArchive, objectPathInRestored)
 	return util.FileCopy(objectPathInArchive, objectPathInRestored)
 }

pkg/backup/manager.go

@@ -41,7 +41,7 @@ type Manager struct {
 
 // RunBackup backups cluster
 func (bm *Manager) RunBackup(cfgPath string, clusterSpec *v1beta1.ClusterSpec, vars constant.CfgVars, savePathDir string) error {
-	bm.discoverSteps(cfgPath, clusterSpec, vars, "backup")
+	bm.discoverSteps(cfgPath, clusterSpec, vars, "backup", "")
 	defer os.RemoveAll(bm.tmpDir)
 	assets := make([]string, 0, len(bm.steps))
 
@@ -68,7 +68,7 @@ func (bm *Manager) RunBackup(cfgPath string, clusterSpec *v1beta1.ClusterSpec, v
 
 }
 
-func (bm *Manager) discoverSteps(cfgPath string, clusterSpec *v1beta1.ClusterSpec, vars constant.CfgVars, action string) {
+func (bm *Manager) discoverSteps(cfgPath string, clusterSpec *v1beta1.ClusterSpec, vars constant.CfgVars, action string, archivePath string) {
 	if clusterSpec.Storage.Type == v1beta1.EtcdStorageType {
 		bm.Add(newEtcdStep(bm.tmpDir, vars.CertRootDir, vars.EtcdCertDir, clusterSpec.Storage.Etcd.PeerAddress, vars.EtcdDataDir))
 	}
@@ -90,7 +90,7 @@ func (bm *Manager) discoverSteps(cfgPath string, clusterSpec *v1beta1.ClusterSpe
 		}
 		bm.Add(NewFilesystemStep(path))
 	}
-	bm.Add(newConfigurationStep(cfgPath))
+	bm.Add(newConfigurationStep(cfgPath, archivePath))
 }
 
 // Add adds backup step
@@ -132,9 +132,9 @@ func (bm *Manager) RunRestore(archivePath string, k0sVars constant.CfgVars) erro
 	defer os.RemoveAll(bm.tmpDir)
 	cfg, err := bm.getConfigForRestore(k0sVars)
 	if err != nil {
-		return fmt.Errorf("failed to parse backuped configuration file, check the backup archive: %v", err)
+		return fmt.Errorf("failed to parse backed-up configuration file.s check the backup archive: %v", err)
 	}
-	bm.discoverSteps(fmt.Sprintf("%s/k0s.yaml", bm.tmpDir), cfg.Spec, k0sVars, "restore")
+	bm.discoverSteps(fmt.Sprintf("%s/k0s.yaml", bm.tmpDir), cfg.Spec, k0sVars, "restore", archivePath)
 	logrus.Info("Starting restore")
 
 	for _, step := range bm.steps {

pkg/backup/util.go

@@ -94,3 +94,9 @@ func addToArchive(tw *tar.Writer, filename string, baseDir string) error {
 func timeStamp() string {
 	return time.Now().Format(timeStampLayout)
 }
+
+func getArchiveTimestamp(archivePath string) string {
+	fileName := filepath.Base(archivePath)
+	nameWithoutExt := strings.Split(fileName, ".")[0]
+	return strings.Trim(nameWithoutExt, "k0s_backup")
+}