Skip to content

fix: cli for data export creation #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duckhawk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: cli for data export creation #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions internal/data/cmd/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")

Expand All @@ -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")

Expand All @@ -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")
Expand All @@ -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)

Expand Down
1 change: 1 addition & 0 deletions internal/data/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const (
VolumeSnapshotKind = "VolumeSnapshot"
VirtualDiskKind = "VirtualDisk"
VirtualDiskSnapshotKind = "VirtualDiskSnapshot"
Namespace = "d8-storage-volume-data-manager"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/data/dataexport/cmd/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion internal/data/dataexport/cmd/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion internal/data/dataexport/cmd/download/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion internal/data/dataexport/cmd/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion internal/data/dataimport/cmd/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion internal/data/dataimport/cmd/upload/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion internal/data/dataimport/cmd/upload/upload_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down