diff --git a/charts/dragonfly/Chart.yaml b/charts/dragonfly/Chart.yaml index 9ae9acab..649bb2af 100644 --- a/charts/dragonfly/Chart.yaml +++ b/charts/dragonfly/Chart.yaml @@ -3,7 +3,7 @@ name: dragonfly description: Dragonfly is an intelligent P2P based image and file distribution system icon: https://raw.githubusercontent.com/dragonflyoss/Dragonfly2/main/docs/images/logo/dragonfly.svg type: application -version: 1.1.2 +version: 1.1.3 appVersion: 2.1.0 keywords: - dragonfly @@ -26,7 +26,8 @@ sources: annotations: artifacthub.io/changes: | - - Add tls config to preheat in manager. + - Add registryTimeout to manager preheat config. + - Add resource to scheduler config. artifacthub.io/links: | - name: Chart Source diff --git a/charts/dragonfly/README.md b/charts/dragonfly/README.md index 8705714b..9b52e36d 100644 --- a/charts/dragonfly/README.md +++ b/charts/dragonfly/README.md @@ -283,7 +283,8 @@ helm delete dragonfly --namespace dragonfly-system | manager.config.cache.redis.ttl | string | `"5m"` | Redis cache TTL duration. | | manager.config.console | bool | `false` | Console shows log on console. | | manager.config.jaeger | string | `""` | | -| manager.config.job.preheat | string | `nil` | Preheat configuration. | +| manager.config.job.preheat | object | `{"registryTimeout":"1m"}` | Preheat configuration. | +| manager.config.job.preheat.registryTimeout | string | `"1m"` | registryTimeout is the timeout for requesting registry to get token and manifest. | | manager.config.network.enableIPv6 | bool | `false` | enableIPv6 enables ipv6. | | manager.config.objectStorage.accessKey | string | `""` | AccessKey is access key ID. | | manager.config.objectStorage.enable | bool | `false` | Enable object storage. | @@ -380,6 +381,13 @@ helm delete dragonfly --namespace dragonfly-system | scheduler.config.manager.schedulerClusterID | int | `1` | Associated scheduler cluster id. | | scheduler.config.network.enableIPv6 | bool | `false` | enableIPv6 enables ipv6. | | scheduler.config.pprofPort | int | `-1` | Listen port for pprof, only valid when the verbose option is true. default is -1. If it is 0, pprof will use a random port. | +| scheduler.config.resource | object | `{"task":{"downloadTiny":{"scheme":"http","timeout":"1m","tls":{"insecureSkipVerify":true}}}}` | resource configuration. | +| scheduler.config.resource.task | object | `{"downloadTiny":{"scheme":"http","timeout":"1m","tls":{"insecureSkipVerify":true}}}` | task configuration. | +| scheduler.config.resource.task.downloadTiny | object | `{"scheme":"http","timeout":"1m","tls":{"insecureSkipVerify":true}}` | downloadTiny is the configuration of downloading tiny task by scheduler. | +| scheduler.config.resource.task.downloadTiny.scheme | string | `"http"` | scheme is download tiny task scheme. | +| scheduler.config.resource.task.downloadTiny.timeout | string | `"1m"` | timeout is http request timeout. | +| scheduler.config.resource.task.downloadTiny.tls | object | `{"insecureSkipVerify":true}` | tls is download tiny task TLS configuration. | +| scheduler.config.resource.task.downloadTiny.tls.insecureSkipVerify | bool | `true` | insecureSkipVerify controls whether a client verifies the server's certificate chain and hostname. | | scheduler.config.scheduler.algorithm | string | `"default"` | Algorithm configuration to use different scheduling algorithms, default configuration supports "default" and "ml". "default" is the rule-based scheduling algorithm, "ml" is the machine learning scheduling algorithm. It also supports user plugin extension, the algorithm value is "plugin", and the compiled `d7y-scheduler-plugin-evaluator.so` file is added to the dragonfly working directory plugins. | | scheduler.config.scheduler.backToSourceCount | int | `3` | backToSourceCount is single task allows the peer to back-to-source count. | | scheduler.config.scheduler.gc.hostGCInterval | string | `"6h"` | hostGCInterval is the interval of host gc. | diff --git a/charts/dragonfly/templates/scheduler/scheduler-configmap.yaml b/charts/dragonfly/templates/scheduler/scheduler-configmap.yaml index a2045d4a..627ccd14 100644 --- a/charts/dragonfly/templates/scheduler/scheduler-configmap.yaml +++ b/charts/dragonfly/templates/scheduler/scheduler-configmap.yaml @@ -30,6 +30,8 @@ data: brokerDB: {{ .Values.externalRedis.brokerDB }} backendDB: {{ .Values.externalRedis.backendDB }} {{- end }} + resource: +{{ toYaml .Values.scheduler.config.resource | indent 6 }} dynconfig: {{ toYaml .Values.scheduler.config.dynconfig | indent 6 }} host: diff --git a/charts/dragonfly/values.yaml b/charts/dragonfly/values.yaml index 1e80eb70..2da8b01e 100644 --- a/charts/dragonfly/values.yaml +++ b/charts/dragonfly/values.yaml @@ -248,6 +248,21 @@ scheduler: # -- hostTTL is time to live of host. If host announces message to scheduler, # then HostTTl will be reset. hostTTL: 1h + # -- resource configuration. + resource: + # -- task configuration. + task: + # -- downloadTiny is the configuration of downloading tiny task by scheduler. + downloadTiny: + # -- scheme is download tiny task scheme. + scheme: http + # -- timeout is http request timeout. + timeout: 1m + # -- tls is download tiny task TLS configuration. + tls: + # -- insecureSkipVerify controls whether a client verifies the + # server's certificate chain and hostname. + insecureSkipVerify: true dynconfig: # -- Type is deprecated and is no longer used. # Please remove it from your configuration. @@ -1294,6 +1309,8 @@ manager: job: # -- Preheat configuration. preheat: + # -- registryTimeout is the timeout for requesting registry to get token and manifest. + registryTimeout: 1m # # TLS configuration. # tls: # # caCert is the CA certificate for preheat tls handshake, it can be path or PEM format string.