From b198d47ee351e4536f3c3d78892c98ce94278239 Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Fri, 23 Jan 2026 15:26:44 +0300 Subject: [PATCH] [data-export] fix cli for data export creation Signed-off-by: v.oleynikov --- internal/data/cmd/data.go | 9 +++++---- internal/data/common.go | 1 + internal/data/dataexport/cmd/create/create.go | 2 +- internal/data/dataexport/cmd/delete/delete.go | 3 ++- internal/data/dataexport/cmd/download/download.go | 2 +- internal/data/dataexport/cmd/list/list.go | 2 +- internal/data/dataimport/cmd/create/create.go | 3 ++- internal/data/dataimport/cmd/upload/upload.go | 2 +- internal/data/dataimport/cmd/upload/upload_windows.go | 2 +- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/internal/data/cmd/data.go b/internal/data/cmd/data.go index 2999cb3a..3a640724 100644 --- a/internal/data/cmd/data.go +++ b/internal/data/cmd/data.go @@ -23,6 +23,7 @@ import ( "github.com/spf13/cobra" + dataio "github.com/deckhouse/deckhouse-cli/internal/data" deCreate "github.com/deckhouse/deckhouse-cli/internal/data/dataexport/cmd/create" deDelete "github.com/deckhouse/deckhouse-cli/internal/data/dataexport/cmd/delete" deDownload "github.com/deckhouse/deckhouse-cli/internal/data/dataexport/cmd/download" @@ -96,7 +97,7 @@ func NewCommand() *cobra.Command { return exportCreateRun(ctx, logger, c, args) }, } - deprecatedCreate.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + deprecatedCreate.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") deprecatedCreate.Flags().String("ttl", "2m", "Time to live") deprecatedCreate.Flags().Bool("publish", false, "Provide access outside of cluster") @@ -110,7 +111,7 @@ func NewCommand() *cobra.Command { return exportListRun(ctx, logger, c, args) }, } - deprecatedList.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + deprecatedList.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") deprecatedList.Flags().Bool("publish", false, "Provide access outside of cluster") deprecatedList.Flags().String("ttl", "2m", "Time to live for auto-created DataExport") @@ -124,7 +125,7 @@ func NewCommand() *cobra.Command { return exportDownloadRun(ctx, logger, c, args) }, } - deprecatedDownload.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + deprecatedDownload.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") deprecatedDownload.Flags().StringP("output", "o", "", "file to save data (default: same as resource)") deprecatedDownload.Flags().Bool("publish", false, "Provide access outside of cluster") deprecatedDownload.Flags().String("ttl", "2m", "Time to live for auto-created DataExport") @@ -139,7 +140,7 @@ func NewCommand() *cobra.Command { return exportDeleteRun(ctx, logger, c, args) }, } - deprecatedDelete.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + deprecatedDelete.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") root.AddCommand(exportCmd, importCmd, deprecatedCreate, deprecatedList, deprecatedDownload, deprecatedDelete) diff --git a/internal/data/common.go b/internal/data/common.go index d2360cfe..509e99b5 100644 --- a/internal/data/common.go +++ b/internal/data/common.go @@ -16,6 +16,7 @@ const ( VolumeSnapshotKind = "VolumeSnapshot" VirtualDiskKind = "VirtualDisk" VirtualDiskSnapshotKind = "VirtualDiskSnapshot" + Namespace = "d8-storage-volume-data-manager" ) var ( diff --git a/internal/data/dataexport/cmd/create/create.go b/internal/data/dataexport/cmd/create/create.go index 21235c66..b01ec8dc 100644 --- a/internal/data/dataexport/cmd/create/create.go +++ b/internal/data/dataexport/cmd/create/create.go @@ -59,7 +59,7 @@ func NewCommand(ctx context.Context, log *slog.Logger) *cobra.Command { }, } - cmd.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + cmd.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") cmd.Flags().String("ttl", "2m", "Time to live") cmd.Flags().Bool("publish", false, "Provide access outside of cluster") diff --git a/internal/data/dataexport/cmd/delete/delete.go b/internal/data/dataexport/cmd/delete/delete.go index 72f4c178..b3054739 100644 --- a/internal/data/dataexport/cmd/delete/delete.go +++ b/internal/data/dataexport/cmd/delete/delete.go @@ -25,6 +25,7 @@ import ( "github.com/spf13/cobra" + dataio "github.com/deckhouse/deckhouse-cli/internal/data" "github.com/deckhouse/deckhouse-cli/internal/data/dataexport/api/v1alpha1" "github.com/deckhouse/deckhouse-cli/internal/data/dataexport/util" safeClient "github.com/deckhouse/deckhouse-cli/pkg/libsaferequest/client" @@ -55,7 +56,7 @@ func NewCommand(ctx context.Context, log *slog.Logger) *cobra.Command { }, } - cmd.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + cmd.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") return cmd } diff --git a/internal/data/dataexport/cmd/download/download.go b/internal/data/dataexport/cmd/download/download.go index 45e185be..412272ca 100644 --- a/internal/data/dataexport/cmd/download/download.go +++ b/internal/data/dataexport/cmd/download/download.go @@ -72,7 +72,7 @@ func NewCommand(ctx context.Context, log *slog.Logger) *cobra.Command { }, } - cmd.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + cmd.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") cmd.Flags().StringP("output", "o", "", "file to save data (default: same as resource)") // TODO support /dev/stdout cmd.Flags().Bool("publish", false, "Provide access outside of cluster") cmd.Flags().String("ttl", "2m", "Time to live for auto-created DataExport") diff --git a/internal/data/dataexport/cmd/list/list.go b/internal/data/dataexport/cmd/list/list.go index 23eac814..165335a6 100644 --- a/internal/data/dataexport/cmd/list/list.go +++ b/internal/data/dataexport/cmd/list/list.go @@ -64,7 +64,7 @@ func NewCommand(ctx context.Context, log *slog.Logger) *cobra.Command { }, } - cmd.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + cmd.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") cmd.Flags().Bool("publish", false, "Provide access outside of cluster") cmd.Flags().String("ttl", "2m", "Time to live for auto-created DataExport") diff --git a/internal/data/dataimport/cmd/create/create.go b/internal/data/dataimport/cmd/create/create.go index 18171428..38002832 100644 --- a/internal/data/dataimport/cmd/create/create.go +++ b/internal/data/dataimport/cmd/create/create.go @@ -27,6 +27,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/yaml" + dataio "github.com/deckhouse/deckhouse-cli/internal/data" v1alpha1 "github.com/deckhouse/deckhouse-cli/internal/data/dataimport/api/v1alpha1" "github.com/deckhouse/deckhouse-cli/internal/data/dataimport/util" safeClient "github.com/deckhouse/deckhouse-cli/pkg/libsaferequest/client" @@ -60,7 +61,7 @@ func NewCommand(ctx context.Context, log *slog.Logger) *cobra.Command { }, } - cmd.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + cmd.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") cmd.Flags().String("ttl", "2m", "Time to live") cmd.Flags().Bool("publish", false, "Provide access outside of cluster") cmd.Flags().StringP("file", "f", "", "PVC manifest file path") diff --git a/internal/data/dataimport/cmd/upload/upload.go b/internal/data/dataimport/cmd/upload/upload.go index e8533a3e..89a1bc3e 100644 --- a/internal/data/dataimport/cmd/upload/upload.go +++ b/internal/data/dataimport/cmd/upload/upload.go @@ -42,7 +42,7 @@ func NewCommand(ctx context.Context, log *slog.Logger) *cobra.Command { }, } - cmd.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + cmd.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") cmd.Flags().StringP("file", "f", "", "file to upload") cmd.Flags().IntP("chunks", "c", 10, "number of chunks to upload") cmd.Flags().BoolP("publish", "P", false, "publish the uploaded file") diff --git a/internal/data/dataimport/cmd/upload/upload_windows.go b/internal/data/dataimport/cmd/upload/upload_windows.go index ccaa0feb..04c590b4 100644 --- a/internal/data/dataimport/cmd/upload/upload_windows.go +++ b/internal/data/dataimport/cmd/upload/upload_windows.go @@ -40,7 +40,7 @@ func NewCommand(ctx context.Context, log *slog.Logger) *cobra.Command { }, } - cmd.Flags().StringP("namespace", "n", "d8-data-exporter", "data volume namespace") + cmd.Flags().StringP("namespace", "n", dataio.Namespace, "data volume namespace") cmd.Flags().StringP("file", "f", "", "file to upload") cmd.Flags().IntP("chunks", "c", 10, "number of chunks to upload") cmd.Flags().BoolP("publish", "P", false, "publish the uploaded file")