Save snapshot request to object store

Author: nprokopic

pkg/snapshot/client.go

@@ -16,7 +16,12 @@ import (
 	"k8s.io/klog/v2"
 )
 
+const (
+	RequestStoreKey = "/vcluster/snapshot/request"
+)
+
 type Client struct {
+	Request  *Request
 	Options  Options
 	skipKeys map[string]struct{}
 }
@@ -145,6 +150,19 @@ func (c *Client) writeSnapshot(ctx context.Context, etcdClient etcd.Client, obje
 		}
 	}
 
+	// write the snapshot request
+	if c.Request != nil {
+		requestBytes, err := json.Marshal(c.Request)
+		if err != nil {
+			return fmt.Errorf("failed to marshal snapshot request: %w", err)
+		}
+		key := fmt.Sprintf("%s/%s", RequestStoreKey, APIVersion)
+		err = writeKeyValue(tarWriter, []byte(key), requestBytes)
+		if err != nil {
+			return fmt.Errorf("failed to snapshot snapshot request: %w", err)
+		}
+	}
+
 	// now write the snapshot
 	backedUpKeys := 0
 	for {

pkg/snapshot/controller.go

@@ -308,6 +308,7 @@ func (c *Reconciler) reconcileCreatingEtcdBackup(ctx context.Context, configMap
 	// Create and save the snapshot! 💾
 	c.logger.Infof("Creating vCluster snapshot in storage type %q", snapshotOptions.Type)
 	snapshotClient := &Client{
+		Request: snapshotRequest,
 		Options: *snapshotOptions,
 	}
 	if !c.isHostMode {

pkg/snapshot/request.go

@@ -13,6 +13,9 @@ import (
 )
 
 const (
+	// APIVersion is the snapshot request API version.
+	APIVersion = "v1beta1"
+
 	RequestKey = "snapshotRequest"
 	OptionsKey = "snapshotOptions"
 

pkg/snapshot/restoreclient.go

@@ -128,6 +128,12 @@ func (o *RestoreClient) Run(ctx context.Context) (retErr error) {
 			}
 		}
 
+		// check snapshot request
+		if strings.HasPrefix(string(key), RequestStoreKey) {
+			klog.Infof("Found snapshot request: %s", string(value))
+			continue
+		}
+
 		// transform pods to make sure they are not deleted on start
 		if strings.HasPrefix(string(key), "/registry/pods/") {
 			// we need to only do this in shared nodes mode as otherwise kubelet will not update the status correctly