dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: update helm-charts submodule version (#1669) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2022-09-08 18:57:20 +08:00
parent 26ebb259db
commit 65f231fb68
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cmd/dfget/cmd/root.go
View File

@ -127,68 +127,68 @@ func init() {
// Initialize default dfget config
dfgetConfig = config.NewDfgetConfig()
// Initialize command and config
dependency.InitCommandAndConfig(rootCmd, true, dfgetConfig)
dependency.InitCommandAndConfig(rootCmd, false, dfgetConfig)
// Add flags
flagSet := rootCmd.Flags()
flagSet.StringVarP(&dfgetConfig.URL, "url", "u", dfgetConfig.URL,
flagSet.StringP("url", "u", dfgetConfig.URL,
"Download one file from the url, equivalent to the command's first position argument")
flagSet.StringVarP(&dfgetConfig.Output, "output", "O", dfgetConfig.Output,
flagSet.StringP("output", "O", dfgetConfig.Output,
"Destination path which is used to store the downloaded file, it must be a full path")
flagSet.DurationVar(&dfgetConfig.Timeout, "timeout", dfgetConfig.Timeout, "Timeout for the downloading task, 0 is infinite")
flagSet.Duration("timeout", dfgetConfig.Timeout, "Timeout for the downloading task, 0 is infinite")
flagSet.String("ratelimit", unit.Bytes(dfgetConfig.RateLimit.Limit).String(),
"The downloading network bandwidth limit per second in format of G(B)/g/M(B)/m/K(B)/k/B, pure number will be parsed as Byte, 0 is infinite")
flagSet.StringVar(&dfgetConfig.Digest, "digest", dfgetConfig.Digest,
flagSet.String("digest", dfgetConfig.Digest,
"Check the integrity of the downloaded file with digest, in format of md5:xxx or sha256:yyy")
flagSet.StringVar(&dfgetConfig.Tag, "tag", dfgetConfig.Tag,
flagSet.String("tag", dfgetConfig.Tag,
"Different tags for the same url will be divided into different P2P overlay, it conflicts with --digest")
flagSet.StringVar(&dfgetConfig.Filter, "filter", dfgetConfig.Filter,
flagSet.String("filter", dfgetConfig.Filter,
"Filter the query parameters of the url, P2P overlay is the same one if the filtered url is same, "+
"in format of key&sign, which will filter 'key' and 'sign' query parameters")
flagSet.StringSliceVarP(&dfgetConfig.Header, "header", "H", dfgetConfig.Header, "url header, eg: --header='Accept: *' --header='Host: abc'")
flagSet.StringSliceP("header", "H", dfgetConfig.Header, "url header, eg: --header='Accept: *' --header='Host: abc'")
flagSet.BoolVar(&dfgetConfig.DisableBackSource, "disable-back-source", dfgetConfig.DisableBackSource,
flagSet.Bool("disable-back-source", dfgetConfig.DisableBackSource,
"Disable downloading directly from source when the daemon fails to download file")
flagSet.StringVarP(&dfgetConfig.Pattern, "pattern", "p", dfgetConfig.Pattern, "The downloading pattern: p2p/seed-peer/source")
flagSet.StringP("pattern", "p", dfgetConfig.Pattern, "The downloading pattern: p2p/seed-peer/source")
flagSet.BoolVarP(&dfgetConfig.ShowProgress, "show-progress", "b", dfgetConfig.ShowProgress, "Show progress bar, it conflicts with --console")
flagSet.BoolP("show-progress", "b", dfgetConfig.ShowProgress, "Show progress bar, it conflicts with --console")
flagSet.StringVar(&dfgetConfig.Application, "application", dfgetConfig.Application, "The caller name which is mainly used for statistics and access control")
flagSet.String("application", dfgetConfig.Application, "The caller name which is mainly used for statistics and access control")
flagSet.StringVar(&dfgetConfig.DaemonSock, "daemon-sock", dfgetConfig.DaemonSock, "Download socket path of daemon. In linux, default value is /var/run/dfdaemon.sock, in macos(just for testing), default value is /tmp/dfdaemon.sock")
flagSet.String("daemon-sock", dfgetConfig.DaemonSock, "Download socket path of daemon. In linux, default value is /var/run/dfdaemon.sock, in macos(just for testing), default value is /tmp/dfdaemon.sock")
flagSet.StringVar(&dfgetConfig.WorkHome, "workhome", dfgetConfig.WorkHome, "Dfget working directory")
flagSet.String("workhome", dfgetConfig.WorkHome, "Dfget working directory")
flagSet.StringVar(&dfgetConfig.LogDir, "logdir", dfgetConfig.LogDir, "Dfget log directory")
flagSet.String("logdir", dfgetConfig.LogDir, "Dfget log directory")
flagSet.BoolVarP(&dfgetConfig.Recursive, "recursive", "r", dfgetConfig.Recursive,
flagSet.BoolP("recursive", "r", dfgetConfig.Recursive,
"Recursively download all resources in target url, the target source client must support list action")
flagSet.UintVar(&dfgetConfig.RecursiveLevel, "level", dfgetConfig.RecursiveLevel,
flagSet.Uint("level", dfgetConfig.RecursiveLevel,
"Recursively download only. Set the maximum number of subdirectories that dfget will recurse into. Set to 0 for no limit")
flagSet.BoolVarP(&dfgetConfig.RecursiveList, "list", "l", dfgetConfig.RecursiveList,
flagSet.BoolP("list", "l", dfgetConfig.RecursiveList,
"Recursively download only. List all urls instead of downloading them.")
flagSet.StringVar(&dfgetConfig.RecursiveAcceptRegex, "accept-regex", dfgetConfig.RecursiveAcceptRegex,
flagSet.String("accept-regex", dfgetConfig.RecursiveAcceptRegex,
"Recursively download only. Specify a regular expression to accept the complete URL. In this case, you have to enclose the pattern into quotes to prevent your shell from expanding it")
flagSet.StringVar(&dfgetConfig.RecursiveRejectRegex, "reject-regex", dfgetConfig.RecursiveRejectRegex,
flagSet.String("reject-regex", dfgetConfig.RecursiveRejectRegex,
`Recursively download only. Specify a regular expression to reject the complete URL. In this case, you have to enclose the pattern into quotes to prevent your shell from expanding it`)
flagSet.BoolVar(&dfgetConfig.KeepOriginalOffset, "original-offset", dfgetConfig.KeepOriginalOffset,
flagSet.Bool("original-offset", dfgetConfig.KeepOriginalOffset,
`Range request only. Download ranged data into target file with original offset. Daemon will make a hardlink to target file. Client can download many ranged data into one file for same url. When enabled, back source in client will be disabled`)
flagSet.StringVar(&dfgetConfig.Range, "range", dfgetConfig.Range,
flagSet.String("range", dfgetConfig.Range,
`Download range. Like: 0-9, stands download 10 bytes from 0 -9, [0:9] in real url`)
// Bind cmd flags

2
deploy/helm-charts

@ -1 +1 @@
Subproject commit 489cb8048f8bfc53562f5fd0b6d41b6ce3222a26
Subproject commit 47a3bac43eaf15ec2eb3434da036baee85a92623

4
manager/config/config.go
View File

@ -566,8 +566,8 @@ func (cfg *Config) Validate() error {
func (cfg *Config) Convert() error {
// TODO Compatible with deprecated fields host and port.
if cfg.Database.Redis.Host != "" && cfg.Database.Redis.Port > 0 {
cfg.Database.Redis.Addrs = append(cfg.Database.Redis.Addrs, fmt.Sprintf("%s:%d", cfg.Database.Redis.Host, cfg.Database.Redis.Port))
if len(cfg.Database.Redis.Addrs) == 0 && cfg.Database.Redis.Host != "" && cfg.Database.Redis.Port > 0 {
cfg.Database.Redis.Addrs[0] = fmt.Sprintf("%s:%d", cfg.Database.Redis.Host, cfg.Database.Redis.Port)
}
return nil

4
scheduler/config/config.go
View File

@ -496,8 +496,8 @@ func (cfg *Config) Validate() error {
func (cfg *Config) Convert() error {
// TODO Compatible with deprecated fields host and port.
if cfg.Job.Redis.Host != "" && cfg.Job.Redis.Port > 0 {
cfg.Job.Redis.Addrs = append(cfg.Job.Redis.Addrs, fmt.Sprintf("%s:%d", cfg.Job.Redis.Host, cfg.Job.Redis.Port))
if len(cfg.Job.Redis.Addrs) == 0 && cfg.Job.Redis.Host != "" && cfg.Job.Redis.Port > 0 {
cfg.Job.Redis.Addrs[0] = fmt.Sprintf("%s:%d", cfg.Job.Redis.Host, cfg.Job.Redis.Port)
}
return nil