Skip to content

Commit

Permalink
feat: add insecureSkipVerify and tlsConfig for preheating in the mana…
Browse files Browse the repository at this point in the history
…ger (#325)

Signed-off-by: Gaius <[email protected]>
  • Loading branch information
gaius-qi authored Sep 27, 2024
1 parent 75569c5 commit b02430c
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 23 deletions.
18 changes: 10 additions & 8 deletions charts/dragonfly/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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.2.14
appVersion: 2.1.56
version: 1.2.15
appVersion: 2.1.59
keywords:
- dragonfly
- d7y
Expand All @@ -27,7 +27,9 @@ sources:

annotations:
artifacthub.io/changes: |
- Add nodePort for services.
- Update dragonfly version to v2.1.59.
- Update client version to v0.1.109.
- Add insecureSkipVerify and tlsConfig for preheating in the manager.
artifacthub.io/links: |
- name: Chart Source
Expand All @@ -38,15 +40,15 @@ annotations:
url: https://github.com/dragonflyoss/client
artifacthub.io/images: |
- name: manager
image: dragonflyoss/manager:v2.1.56
image: dragonflyoss/manager:v2.1.59
- name: scheduler
image: dragonflyoss/scheduler:v2.1.56
image: dragonflyoss/scheduler:v2.1.59
- name: client
image: dragonflyoss/client:v0.1.107
image: dragonflyoss/client:v0.1.109
- name: seed-client
image: dragonflyoss/client:v0.1.107
image: dragonflyoss/client:v0.1.109
- name: dfinit
image: dragonflyoss/dfinit:v0.1.107
image: dragonflyoss/dfinit:v0.1.109
dependencies:
- name: mysql
Expand Down
13 changes: 7 additions & 6 deletions charts/dragonfly/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ helm delete dragonfly --namespace dragonfly-system
| client.dfinit.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
| client.dfinit.image.registry | string | `"docker.io"` | Image registry. |
| client.dfinit.image.repository | string | `"dragonflyoss/dfinit"` | Image repository. |
| client.dfinit.image.tag | string | `"v0.1.107"` | Image tag. |
| client.dfinit.image.tag | string | `"v0.1.109"` | Image tag. |
| client.enable | bool | `true` | Enable client. |
| client.extraVolumeMounts | list | `[{"mountPath":"/var/lib/dragonfly/","name":"storage"},{"mountPath":"/var/log/dragonfly/dfdaemon/","name":"logs"}]` | Extra volumeMounts for dfdaemon. |
| client.extraVolumes | list | `[{"hostPath":{"path":"/var/lib/dragonfly/","type":"DirectoryOrCreate"},"name":"storage"},{"emptyDir":{},"name":"logs"}]` | Extra volumes for dfdaemon. |
Expand All @@ -188,7 +188,7 @@ helm delete dragonfly --namespace dragonfly-system
| client.image.pullSecrets | list | `[]` (defaults to global.imagePullSecrets). | Image pull secrets. |
| client.image.registry | string | `"docker.io"` | Image registry. |
| client.image.repository | string | `"dragonflyoss/client"` | Image repository. |
| client.image.tag | string | `"v0.1.107"` | Image tag. |
| client.image.tag | string | `"v0.1.109"` | Image tag. |
| client.initContainer.image.digest | string | `""` | Image digest. |
| client.initContainer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
| client.initContainer.image.registry | string | `"docker.io"` | Image registry. |
Expand Down Expand Up @@ -253,8 +253,9 @@ helm delete dragonfly --namespace dragonfly-system
| manager.config.job.gc | object | `{"interval":"24h","ttl":"24h"}` | gc configuration. |
| manager.config.job.gc.interval | string | `"24h"` | interval is the interval of gc. |
| manager.config.job.gc.ttl | string | `"24h"` | ttl is the ttl of job. |
| manager.config.job.preheat | object | `{"registryTimeout":"1m"}` | Preheat configuration. |
| manager.config.job.preheat | object | `{"registryTimeout":"1m","tls":{"insecureSkipVerify":false}}` | Preheat configuration. |
| manager.config.job.preheat.registryTimeout | string | `"1m"` | registryTimeout is the timeout for requesting registry to get token and manifest. |
| manager.config.job.preheat.tls.insecureSkipVerify | bool | `false` | insecureSkipVerify controls whether a client verifies the server's certificate chain and hostname. |
| manager.config.job.rateLimit | object | `{"capacity":10,"fillInterval":"1m","quantum":10}` | rateLimit configuration. |
| manager.config.job.rateLimit.capacity | int | `10` | capacity is the maximum number of requests that can be consumed in a single fillInterval. |
| manager.config.job.rateLimit.fillInterval | string | `"1m"` | fillInterval is the interval for refilling the bucket. |
Expand Down Expand Up @@ -298,7 +299,7 @@ helm delete dragonfly --namespace dragonfly-system
| manager.image.pullSecrets | list | `[]` (defaults to global.imagePullSecrets). | Image pull secrets. |
| manager.image.registry | string | `"docker.io"` | Image registry. |
| manager.image.repository | string | `"dragonflyoss/manager"` | Image repository. |
| manager.image.tag | string | `"v2.1.56"` | Image tag. |
| manager.image.tag | string | `"v2.1.59"` | Image tag. |
| manager.ingress.annotations | object | `{}` | Ingress annotations. |
| manager.ingress.className | string | `""` | Ingress class name. Requirement: kubernetes >=1.18. |
| manager.ingress.enable | bool | `false` | Enable ingress. |
Expand Down Expand Up @@ -421,7 +422,7 @@ helm delete dragonfly --namespace dragonfly-system
| scheduler.image.pullSecrets | list | `[]` (defaults to global.imagePullSecrets). | Image pull secrets. |
| scheduler.image.registry | string | `"docker.io"` | Image registry. |
| scheduler.image.repository | string | `"dragonflyoss/scheduler"` | Image repository. |
| scheduler.image.tag | string | `"v2.1.56"` | Image tag. |
| scheduler.image.tag | string | `"v2.1.59"` | Image tag. |
| scheduler.initContainer.image.digest | string | `""` | Image digest. |
| scheduler.initContainer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
| scheduler.initContainer.image.registry | string | `"docker.io"` | Image registry. |
Expand Down Expand Up @@ -505,7 +506,7 @@ helm delete dragonfly --namespace dragonfly-system
| seedClient.image.pullSecrets | list | `[]` (defaults to global.imagePullSecrets). | Image pull secrets. |
| seedClient.image.registry | string | `"docker.io"` | Image registry. |
| seedClient.image.repository | string | `"dragonflyoss/client"` | Image repository. |
| seedClient.image.tag | string | `"v0.1.107"` | Image tag. |
| seedClient.image.tag | string | `"v0.1.109"` | Image tag. |
| seedClient.initContainer.image.digest | string | `""` | Image digest. |
| seedClient.initContainer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
| seedClient.initContainer.image.registry | string | `"docker.io"` | Image registry. |
Expand Down
20 changes: 11 additions & 9 deletions charts/dragonfly/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ manager:
# -- Image repository.
repository: dragonflyoss/manager
# -- Image tag.
tag: v2.1.56
tag: v2.1.59
# -- Image digest.
digest: ""
# -- Image pull policy.
Expand Down Expand Up @@ -198,10 +198,12 @@ manager:
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.
# caCert: ''
tls:
# -- insecureSkipVerify controls whether a client verifies the
# server's certificate chain and hostname.
insecureSkipVerify: false
# # caCert is the CA certificate for preheat tls handshake, it can be path or PEM format string.
# caCert: ''
objectStorage:
# -- Enable object storage.
enable: false
Expand Down Expand Up @@ -349,7 +351,7 @@ scheduler:
# -- Image repository.
repository: dragonflyoss/scheduler
# -- Image tag.
tag: v2.1.56
tag: v2.1.59
# -- Image digest.
digest: ""
# -- Image pull policy.
Expand Down Expand Up @@ -757,7 +759,7 @@ seedClient:
# -- Image repository.
repository: dragonflyoss/client
# -- Image tag.
tag: v0.1.107
tag: v0.1.109
# -- Image digest.
digest: ""
# -- Image pull policy.
Expand Down Expand Up @@ -1084,7 +1086,7 @@ client:
# -- Image repository.
repository: dragonflyoss/client
# -- Image tag.
tag: v0.1.107
tag: v0.1.109
# -- Image digest.
digest: ""
# -- Image pull policy.
Expand Down Expand Up @@ -1167,7 +1169,7 @@ client:
# -- Image repository.
repository: dragonflyoss/dfinit
# -- Image tag.
tag: v0.1.107
tag: v0.1.109
# -- Image digest.
digest: ""
# -- Image pull policy.
Expand Down

0 comments on commit b02430c

Please sign in to comment.