Skip to content

Commit 6fc6c79

Browse files
authored
feat: update Dragonfly Helm chart to v1.3.37 with OTLP HTTP/GRPC support (#391)
Signed-off-by: Gaius <gaius.qi@gmail.com>
1 parent 2ca22a9 commit 6fc6c79

3 files changed

Lines changed: 56 additions & 40 deletions

File tree

charts/dragonfly/Chart.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: dragonfly
33
description: Dragonfly is an intelligent P2P based image and file distribution system
44
icon: https://raw.githubusercontent.com/dragonflyoss/dragonfly/main/docs/images/logo/dragonfly.svg
55
type: application
6-
version: 1.3.36
7-
appVersion: 2.2.4-beta.1
6+
version: 1.3.37
7+
appVersion: 2.2.4-rc.0
88
keywords:
99
- dragonfly
1010
- d7y
@@ -27,7 +27,9 @@ sources:
2727

2828
annotations:
2929
artifacthub.io/changes: |
30-
- Change peerTTL from 48h to 720h in scheduler.
30+
- Bump dragonfly to v2.2.4-rc.0.
31+
- Bump client to v0.2.37.
32+
- Add http and grpc support for otel.
3133
3234
artifacthub.io/links: |
3335
- name: Chart Source
@@ -38,15 +40,15 @@ annotations:
3840
url: https://github.com/dragonflyoss/client
3941
artifacthub.io/images: |
4042
- name: manager
41-
image: dragonflyoss/manager:v2.2.4-beta.1
43+
image: dragonflyoss/manager:v2.2.4-rc.0
4244
- name: scheduler
43-
image: dragonflyoss/scheduler:v2.2.4-beta.1
45+
image: dragonflyoss/scheduler:v2.2.4-rc.0
4446
- name: client
45-
image: dragonflyoss/client:v0.2.35
47+
image: dragonflyoss/client:v0.2.37
4648
- name: seed-client
47-
image: dragonflyoss/client:v0.2.35
49+
image: dragonflyoss/client:v0.2.37
4850
- name: dfinit
49-
image: dragonflyoss/dfinit:v0.2.35
51+
image: dragonflyoss/dfinit:v0.2.37
5052
5153
dependencies:
5254
- name: mysql

charts/dragonfly/README.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ helm delete dragonfly --namespace dragonfly-system
177177
| client.dfinit.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
178178
| client.dfinit.image.registry | string | `"docker.io"` | Image registry. |
179179
| client.dfinit.image.repository | string | `"dragonflyoss/dfinit"` | Image repository. |
180-
| client.dfinit.image.tag | string | `"v0.2.35"` | Image tag. |
180+
| client.dfinit.image.tag | string | `"v0.2.37"` | Image tag. |
181181
| client.dfinit.restartContainerRuntime | bool | `true` | restartContainerRuntime indicates whether to restart container runtime when dfinit is enabled. it should be set to true when your first install dragonfly. If non-hot load configuration changes are made, the container runtime needs to be restarted. |
182182
| client.enable | bool | `true` | Enable client. |
183183
| client.extraVolumeMounts | list | `[{"mountPath":"/var/lib/dragonfly/","name":"storage"},{"mountPath":"/var/log/dragonfly/dfdaemon/","name":"logs"}]` | Extra volumeMounts for dfdaemon. |
@@ -192,7 +192,7 @@ helm delete dragonfly --namespace dragonfly-system
192192
| client.image.pullSecrets | list | `[]` (defaults to global.imagePullSecrets). | Image pull secrets. |
193193
| client.image.registry | string | `"docker.io"` | Image registry. |
194194
| client.image.repository | string | `"dragonflyoss/client"` | Image repository. |
195-
| client.image.tag | string | `"v0.2.35"` | Image tag. |
195+
| client.image.tag | string | `"v0.2.37"` | Image tag. |
196196
| client.initContainer.image.digest | string | `""` | Image digest. |
197197
| client.initContainer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
198198
| client.initContainer.image.registry | string | `"docker.io"` | Image registry. |
@@ -275,8 +275,6 @@ helm delete dragonfly --namespace dragonfly-system
275275
| manager.config.server.rest.tls.cert | string | `""` | Certificate file path. |
276276
| manager.config.server.rest.tls.key | string | `""` | Key file path. |
277277
| manager.config.server.workHome | string | `""` | Work directory. |
278-
| manager.config.tracing.addr | string | `""` | |
279-
| manager.config.tracing.headers | object | `{}` | |
280278
| manager.config.verbose | bool | `true` | Whether to enable debug level logger and enable pprof. |
281279
| manager.deploymentAnnotations | object | `{}` | Deployment annotations. |
282280
| manager.enable | bool | `true` | Enable manager. |
@@ -291,7 +289,7 @@ helm delete dragonfly --namespace dragonfly-system
291289
| manager.image.pullSecrets | list | `[]` (defaults to global.imagePullSecrets). | Image pull secrets. |
292290
| manager.image.registry | string | `"docker.io"` | Image registry. |
293291
| manager.image.repository | string | `"dragonflyoss/manager"` | Image repository. |
294-
| manager.image.tag | string | `"v2.2.4-beta.1"` | Image tag. |
292+
| manager.image.tag | string | `"v2.2.4-rc.0"` | Image tag. |
295293
| manager.ingress.annotations | object | `{}` | Ingress annotations. |
296294
| manager.ingress.className | string | `""` | Ingress class name. Requirement: kubernetes >=1.18. |
297295
| manager.ingress.enable | bool | `false` | Enable ingress. |
@@ -378,8 +376,6 @@ helm delete dragonfly --namespace dragonfly-system
378376
| scheduler.config.server.pluginDir | string | `""` | Plugin directory. |
379377
| scheduler.config.server.port | int | `8002` | Server port. |
380378
| scheduler.config.server.workHome | string | `""` | Work directory. |
381-
| scheduler.config.tracing.addr | string | `""` | |
382-
| scheduler.config.tracing.headers | object | `{}` | |
383379
| scheduler.config.verbose | bool | `true` | Whether to enable debug level logger and enable pprof. |
384380
| scheduler.containerPort | int | `8002` | Pod containerPort. |
385381
| scheduler.enable | bool | `true` | Enable scheduler. |
@@ -393,7 +389,7 @@ helm delete dragonfly --namespace dragonfly-system
393389
| scheduler.image.pullSecrets | list | `[]` (defaults to global.imagePullSecrets). | Image pull secrets. |
394390
| scheduler.image.registry | string | `"docker.io"` | Image registry. |
395391
| scheduler.image.repository | string | `"dragonflyoss/scheduler"` | Image repository. |
396-
| scheduler.image.tag | string | `"v2.2.4-beta.1"` | Image tag. |
392+
| scheduler.image.tag | string | `"v2.2.4-rc.0"` | Image tag. |
397393
| scheduler.initContainer.image.digest | string | `""` | Image digest. |
398394
| scheduler.initContainer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
399395
| scheduler.initContainer.image.registry | string | `"docker.io"` | Image registry. |
@@ -481,7 +477,7 @@ helm delete dragonfly --namespace dragonfly-system
481477
| seedClient.image.pullSecrets | list | `[]` (defaults to global.imagePullSecrets). | Image pull secrets. |
482478
| seedClient.image.registry | string | `"docker.io"` | Image registry. |
483479
| seedClient.image.repository | string | `"dragonflyoss/client"` | Image repository. |
484-
| seedClient.image.tag | string | `"v0.2.35"` | Image tag. |
480+
| seedClient.image.tag | string | `"v0.2.37"` | Image tag. |
485481
| seedClient.initContainer.image.digest | string | `""` | Image digest. |
486482
| seedClient.initContainer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. |
487483
| seedClient.initContainer.image.registry | string | `"docker.io"` | Image registry. |

charts/dragonfly/values.yaml

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ manager:
3939
# -- Image repository.
4040
repository: dragonflyoss/manager
4141
# -- Image tag.
42-
tag: v2.2.4-beta.1
42+
tag: v2.2.4-rc.0
4343
# -- Image digest.
4444
digest: ""
4545
# -- Image pull policy.
@@ -221,11 +221,16 @@ manager:
221221
# -- Listen port for pprof, only valid when the verbose option is true
222222
# default is -1. If it is 0, pprof will use a random port.
223223
pprofPort: -1
224-
tracing:
225-
# - Jaeger endpoint url, like: jaeger.dragonfly.svc:4317.
226-
addr: ""
227-
# - Headers is the grpc's headers to send with tracing log.
228-
headers: {}
224+
# # tracing is the tracing configuration for dfdaemon.
225+
# tracing:
226+
# # Protocol specifies the communication protocol for the tracing server.
227+
# # Supported values: "http", "https", "grpc" (default: None).
228+
# # This determines how tracing logs are transmitted to the server.
229+
# protocol: grpc
230+
# # endpoint is the endpoint to report tracing log, example: "localhost:4317".
231+
# endpoint: localhost:4317
232+
# # headers is the grpc's headers to send with tracing log.
233+
# headers: {}
229234
metrics:
230235
# -- Enable manager metrics.
231236
enable: true
@@ -315,7 +320,7 @@ scheduler:
315320
# -- Image repository.
316321
repository: dragonflyoss/scheduler
317322
# -- Image tag.
318-
tag: v2.2.4-beta.1
323+
tag: v2.2.4-rc.0
319324
# -- Image digest.
320325
digest: ""
321326
# -- Image pull policy.
@@ -496,11 +501,16 @@ scheduler:
496501
# -- Listen port for pprof, only valid when the verbose option is true.
497502
# default is -1. If it is 0, pprof will use a random port.
498503
pprofPort: -1
499-
tracing:
500-
# - Jaeger endpoint url, like: jaeger.dragonfly.svc:4317.
501-
addr: ""
502-
# - Headers is the grpc's headers to send with tracing log.
503-
headers: {}
504+
# # tracing is the tracing configuration for dfdaemon.
505+
# tracing:
506+
# # Protocol specifies the communication protocol for the tracing server.
507+
# # Supported values: "http", "https", "grpc" (default: None).
508+
# # This determines how tracing logs are transmitted to the server.
509+
# protocol: grpc
510+
# # endpoint is the endpoint to report tracing log, example: "localhost:4317".
511+
# endpoint: localhost:4317
512+
# # headers is the grpc's headers to send with tracing log.
513+
# headers: {}
504514
metrics:
505515
# -- Enable scheduler metrics.
506516
enable: true
@@ -688,7 +698,7 @@ seedClient:
688698
# -- Image repository.
689699
repository: dragonflyoss/client
690700
# -- Image tag.
691-
tag: v0.2.35
701+
tag: v0.2.37
692702
# -- Image digest.
693703
digest: ""
694704
# -- Image pull policy.
@@ -1032,10 +1042,14 @@ seedClient:
10321042
# ip: ""
10331043
# # tracing is the tracing configuration for dfdaemon.
10341044
# tracing:
1035-
# # addr is the address to report tracing log, like jaeger.dragonfly.svc:4317.
1036-
# addr: ""
1037-
# # Headers is the grpc's headers to send with tracing log.
1038-
# headers: {}
1045+
# # Protocol specifies the communication protocol for the tracing server.
1046+
# # Supported values: "http", "https", "grpc" (default: None).
1047+
# # This determines how tracing logs are transmitted to the server.
1048+
# protocol: grpc
1049+
# # endpoint is the endpoint to report tracing log, example: "localhost:4317".
1050+
# endpoint: localhost:4317
1051+
# # headers is the grpc's headers to send with tracing log.
1052+
# headers: {}
10391053
metrics:
10401054
# -- Enable seed client metrics.
10411055
enable: true
@@ -1107,7 +1121,7 @@ client:
11071121
# -- Image repository.
11081122
repository: dragonflyoss/client
11091123
# -- Image tag.
1110-
tag: v0.2.35
1124+
tag: v0.2.37
11111125
# -- Image digest.
11121126
digest: ""
11131127
# -- Image pull policy.
@@ -1194,7 +1208,7 @@ client:
11941208
# -- Image repository.
11951209
repository: dragonflyoss/dfinit
11961210
# -- Image tag.
1197-
tag: v0.2.35
1211+
tag: v0.2.37
11981212
# -- Image digest.
11991213
digest: ""
12001214
# -- Image pull policy.
@@ -1516,10 +1530,14 @@ client:
15161530
# ip: ""
15171531
# # tracing is the tracing configuration for dfdaemon.
15181532
# tracing:
1519-
# # addr is the address to report tracing log, like jaeger.dragonfly.svc:4317.
1520-
# addr: ""
1521-
# # Headers is the grpc's headers to send with tracing log.
1522-
# headers: {}
1533+
# # Protocol specifies the communication protocol for the tracing server.
1534+
# # Supported values: "http", "https", "grpc" (default: None).
1535+
# # This determines how tracing logs are transmitted to the server.
1536+
# protocol: grpc
1537+
# # endpoint is the endpoint to report tracing log, example: "localhost:4317".
1538+
# endpoint: localhost:4317
1539+
# # headers is the grpc's headers to send with tracing log.
1540+
# headers: {}
15231541
metrics:
15241542
# -- Enable client metrics.
15251543
enable: true

0 commit comments

Comments
 (0)