feat(ec): improved disaster recovery - take multiple backups (#5028)

* feat(ec): improved disaster recovery * app version record restore spec * fix tests * refactor * refactor * refactor * refactor * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * f * rename function * feat(ec): use label for backup name, use common terminology (#5031) * rename to hasAppBackupSpec * type legacy * dont render app spec for improved dr * dont render app spec for improved dr * rename to hasAppBackup * disable GetInstanceBackupType check in list handler * remove backup detail from ci * fix tests * remove todo comment * dont add new annotations and labels if not improved dr
replicatedhq · Dec 9, 2024 · 2393c2e · 2393c2e
1 parent 83d142f
commit 2393c2e
Show file tree

Hide file tree

Showing 15 changed files with 2,756 additions and 323 deletions.
diff --git a/migrations/tables/app_version.yaml b/migrations/tables/app_version.yaml
@@ -67,6 +67,8 @@ spec:
         type: text
       - name: backup_spec
         type: text
+      - name: restore_spec
+        type: text
       - name: identity_spec
         type: text
       - name: branding_archive

diff --git a/pkg/handlers/backup.go b/pkg/handlers/backup.go
@@ -206,7 +206,7 @@ func (h *Handler) CreateInstanceBackup(w http.ResponseWriter, r *http.Request) {
 	}
 	c := clusters[0]
 
-	backup, err := snapshot.CreateInstanceBackup(context.TODO(), c, false)
+	backupName, err := snapshot.CreateInstanceBackup(context.TODO(), c, false)
 	if err != nil {
 		logger.Error(errors.Wrap(err, "failed to create instance snapshot"))
 		createInstanceBackupResponse.Error = "failed to create instance backup"
@@ -215,7 +215,7 @@ func (h *Handler) CreateInstanceBackup(w http.ResponseWriter, r *http.Request) {
 	}
 
 	createInstanceBackupResponse.Success = true
-	createInstanceBackupResponse.BackupName = backup.ObjectMeta.Name
+	createInstanceBackupResponse.BackupName = backupName
 
 	JSON(w, http.StatusOK, createInstanceBackupResponse)
 }
diff --git a/pkg/handlers/restore.go b/pkg/handlers/restore.go
@@ -47,6 +47,14 @@ func (h *Handler) CreateApplicationRestore(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
+	if snapshot.IsInstanceBackup(*backup) && snapshot.GetInstanceBackupType(*backup) != snapshottypes.InstanceBackupTypeLegacy {
+		err := errors.New("only legacy type instance backups are restorable")
+		logger.Error(err)
+		createRestoreResponse.Error = err.Error()
+		JSON(w, http.StatusInternalServerError, createRestoreResponse)
+		return
+	}
+
 	appID := backup.Annotations["kots.io/app-id"]
 	sequence, err := strconv.ParseInt(backup.Annotations["kots.io/app-sequence"], 10, 64)
 	if err != nil {
@@ -149,7 +157,7 @@ func (h *Handler) RestoreApps(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if backup.Annotations["kots.io/instance"] != "true" {
+	if backup.Annotations[snapshottypes.InstanceBackupAnnotation] != "true" {
 		err := errors.Errorf("backup %s is not an instance backup", backup.ObjectMeta.Name)
 		logger.Error(err)
 		restoreResponse.Error = err.Error()
@@ -244,7 +252,7 @@ func (h *Handler) GetRestoreAppsStatus(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if backup.Annotations["kots.io/instance"] != "true" {
+	if backup.Annotations[snapshottypes.InstanceBackupAnnotation] != "true" {
 		err := errors.Errorf("backup %s is not an instance backup", backup.ObjectMeta.Name)
 		logger.Error(err)
 		response.Error = err.Error()

diff --git a/pkg/k8sutil/kotsadm.go b/pkg/k8sutil/kotsadm.go
@@ -21,12 +21,7 @@ const (
 	KotsadmIDConfigMapName = "kotsadm-id"
 )
 
-func FindKotsadmImage(namespace string) (string, error) {
-	clientset, err := GetClientset()
-	if err != nil {
-		return "", errors.Wrap(err, "failed to get k8s client set")
-	}
-
+func FindKotsadmImage(clientset kubernetes.Interface, namespace string) (string, error) {
 	var containers []corev1.Container
 	if os.Getenv("POD_OWNER_KIND") == "deployment" {
 		kotsadmDeployment, err := clientset.AppsV1().Deployments(namespace).Get(context.TODO(), "kotsadm", metav1.GetOptions{})