Add--include-volumes flag to vcluster snapshot create

Author: nprokopic

cmd/vclusterctl/cmd/snapshot/create.go

@@ -12,8 +12,9 @@ import (
 
 type CreateCmd struct {
 	*flags.GlobalFlags
-	Snapshot snapshot.Options
-	Log      log.Logger
+	Snapshot       snapshot.Options
+	IncludeVolumes bool
+	Log            log.Logger
 }
 
 func NewCreateCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
@@ -45,12 +46,13 @@ vcluster snapshot create my-vcluster container:///data/my-local-snapshot.tar.gz
 		Args:              nameValidator,
 		ValidArgsFunction: completion.NewValidVClusterNameFunc(globalFlags),
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
-			return cli.Snapshot(cobraCmd.Context(), args, cmd.GlobalFlags, &cmd.Snapshot, nil, cmd.Log, true)
+			return cli.Snapshot(cobraCmd.Context(), args, cmd.GlobalFlags, &cmd.Snapshot, nil, cmd.Log, true, cmd.IncludeVolumes)
 		},
 	}
 
 	// add storage flags
 	snapshot.AddFlags(createCmd.Flags(), &cmd.Snapshot)
+	createCmd.Flags().BoolVarP(&cmd.IncludeVolumes, "include-volumes", "", false, "Create CSI volume snapshots (shared and private nodes only)")
 
 	return createCmd
 }

cmd/vclusterctl/cmd/snapshot/root.go

@@ -48,7 +48,7 @@ vcluster snapshot my-vcluster container:///data/my-local-snapshot.tar.gz
 		Args:              nameValidator,
 		ValidArgsFunction: completion.NewValidVClusterNameFunc(globalFlags),
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
-			return cli.Snapshot(cobraCmd.Context(), args, rootCmd.GlobalFlags, &rootCmd.Snapshot, &rootCmd.Pod, rootCmd.Log, false)
+			return cli.Snapshot(cobraCmd.Context(), args, rootCmd.GlobalFlags, &rootCmd.Snapshot, &rootCmd.Pod, rootCmd.Log, false, false)
 		},
 	}
 

pkg/cli/snapshot_helm.go

@@ -26,7 +26,7 @@ const (
 	minAsyncSnapshotVersion = "0.29.0-alpha.1"
 )
 
-func Snapshot(ctx context.Context, args []string, globalFlags *flags.GlobalFlags, snapshotOpts *snapshot.Options, podOptions *pod.Options, log log.Logger, async bool) error {
+func Snapshot(ctx context.Context, args []string, globalFlags *flags.GlobalFlags, snapshotOpts *snapshot.Options, podOptions *pod.Options, log log.Logger, async, includeVolumes bool) error {
 	// init kube client and vCluster
 	vCluster, kubeClient, restConfig, err := initSnapshotCommand(ctx, args, globalFlags, snapshotOpts, log)
 	if err != nil {
@@ -57,7 +57,7 @@ func Snapshot(ctx context.Context, args []string, globalFlags *flags.GlobalFlags
 	}
 
 	// creating snapshot request with 'vcluster snapshot create' command
-	err = createSnapshotRequest(ctx, vCluster, kubeClient, snapshotOpts, log)
+	err = createSnapshotRequest(ctx, vCluster, kubeClient, snapshotOpts, log, includeVolumes)
 	if err != nil {
 		return err
 	}
@@ -129,7 +129,7 @@ func initSnapshotCommand(
 	return vCluster, kubeClient, restClient, nil
 }
 
-func createSnapshotRequest(ctx context.Context, vCluster *find.VCluster, kubeClient *kubernetes.Clientset, snapshotOpts *snapshot.Options, log log.Logger) error {
+func createSnapshotRequest(ctx context.Context, vCluster *find.VCluster, kubeClient *kubernetes.Clientset, snapshotOpts *snapshot.Options, log log.Logger, includeVolumes bool) error {
 	vClusterConfig, err := getVClusterConfig(ctx, vCluster, kubeClient, snapshotOpts)
 	if err != nil {
 		return err
@@ -156,6 +156,9 @@ func createSnapshotRequest(ctx context.Context, vCluster *find.VCluster, kubeCli
 	// then create the snapshot request that will be reconciled by the controller
 	snapshotRequest := &snapshot.Request{
 		Name: secret.Name,
+		Spec: snapshot.RequestSpec{
+			IncludeVolumes: includeVolumes,
+		},
 	}
 	configMap, err := snapshot.CreateSnapshotRequestConfigMap(vCluster.Namespace, vCluster.Name, snapshotRequest)
 	if err != nil {

pkg/snapshot/controller.go

@@ -265,8 +265,13 @@ func (c *Reconciler) Register() error {
 
 // reconcileNewRequest updates the snapshot request phase to "InProgress".
 func (c *Reconciler) reconcileNewRequest(ctx context.Context, configMap *corev1.ConfigMap, snapshotRequest *Request) error {
-	snapshotRequest.Status.Phase = RequestPhaseCreatingVolumeSnapshots
-	c.eventRecorder.Eventf(configMap, corev1.EventTypeNormal, "SnapshotRequestCreatingVolumeSnapshots", "Started to create volume snapshots for snapshot request %s/%s", configMap.Namespace, configMap.Name)
+	if snapshotRequest.Spec.IncludeVolumes {
+		snapshotRequest.Status.Phase = RequestPhaseCreatingVolumeSnapshots
+		c.eventRecorder.Eventf(configMap, corev1.EventTypeNormal, "SnapshotRequestCreatingVolumeSnapshots", "Started to create volume snapshots for snapshot request %s/%s", configMap.Namespace, configMap.Name)
+	} else {
+		snapshotRequest.Status.Phase = RequestPhaseCreatingEtcdBackup
+		c.eventRecorder.Eventf(configMap, corev1.EventTypeNormal, "SnapshotRequestCreatingEtcdBackup", "Started to create etcd backup for snapshot request %s/%s", configMap.Namespace, configMap.Name)
+	}
 	return nil
 }
 

pkg/snapshot/request.go

@@ -39,7 +39,8 @@ func (r *Request) Done() bool {
 }
 
 type RequestSpec struct {
-	VolumeSnapshots volumes.SnapshotRequest `json:"volumeSnapshots"`
+	IncludeVolumes  bool                    `json:"includeVolumes,omitempty"`
+	VolumeSnapshots volumes.SnapshotRequest `json:"volumeSnapshots,omitempty"`
 	Options         Options                 `json:"-"`
 }