fix: empty host and empty tracing in client config (#217)

Signed-off-by: Gaius <[email protected]>

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.13
+version: 1.1.14
 appVersion: 2.1.28
 keywords:
   - dragonfly
@@ -26,7 +26,9 @@ sources:
 
 annotations:
   artifacthub.io/changes: |
-    - Fix manager addrs in client and seed client.
+    - Fix empty host field in client config.
+    - Fix empty tracing field in client config.
+    - Update client image version to v0.1.7.
 
   artifacthub.io/links: |
     - name: Chart Source
@@ -39,9 +41,9 @@ annotations:
     - name: scheduler
       image: dragonflyoss/scheduler:v2.1.28
     - name: client
-      image: dragonflyoss/client:v0.1.4
+      image: dragonflyoss/client:v0.1.7
     - name: seed-client
-      image: dragonflyoss/client:v0.1.4
+      image: dragonflyoss/client:v0.1.7
     - name: dfdaemon
       image: dragonflyoss/dfdaemon:v2.1.28
     - name: trainer

charts/dragonfly/README.md

@@ -137,7 +137,7 @@ helm delete dragonfly --namespace dragonfly-system
 | client.config.gc.policy.distHighThresholdPercent | int | `80` | distHighThresholdPercent is the high threshold percent of the disk usage. If the disk usage is greater than the threshold, dfdaemon will do gc. |
 | client.config.gc.policy.distLowThresholdPercent | int | `60` | distLowThresholdPercent is the low threshold percent of the disk usage. If the disk usage is less than the threshold, dfdaemon will stop gc. |
 | client.config.gc.policy.taskTTL | string | `"21600s"` | taskTTL is the ttl of the task. |
-| client.config.host | string | `nil` | host is the host configuration for dfdaemon. |
+| client.config.host | object | `{"idc":"","location":""}` | host is the host configuration for dfdaemon. |
 | client.config.manager.addrs | list | `[]` | addrs is manager addresses. |
 | client.config.metrics.port | int | `4001` | port is the port to the metrics server. |
 | client.config.proxy.enable | bool | `true` | enable indicates whether enable proxy. |
@@ -149,7 +149,6 @@ helm delete dragonfly --namespace dragonfly-system
 | client.config.server.cacheDir | string | `"/var/cache/dragonfly/dfdaemon/"` | cacheDir is the directory to store cache files. |
 | client.config.server.pluginDir | string | `"/var/lib/dragonfly/plugins/dfdaemon/"` | pluginDir is the directory to store plugins. |
 | client.config.storage.dir | string | `"/var/lib/dragonfly/"` | dir is the directory to store task's metadata and content. |
-| client.config.tracing | string | `nil` | tracing is the tracing configuration for dfdaemon. |
 | client.config.upload.server.port | int | `4000` | port is the port to the grpc server. |
 | client.enable | bool | `false` | Enable client. |
 | client.extraVolumeMounts | list | `[{"mountPath":"/var/log/dragonfly/dfdaemon/","name":"logs"}]` | Extra volumeMounts for dfdaemon. |
@@ -183,7 +182,7 @@ helm delete dragonfly --namespace dragonfly-system
 | client.replicas | int | `3` | Number of Pods to launch. |
 | client.resources | object | `{"limits":{"cpu":"2","memory":"4Gi"},"requests":{"cpu":"0","memory":"0"}}` | Pod resource requests and limits. |
 | client.statefulsetAnnotations | object | `{}` | Statefulset annotations. |
-| client.tag | string | `"v0.1.4"` | Image tag. |
+| client.tag | string | `"v0.1.7"` | Image tag. |
 | client.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds. |
 | client.tolerations | list | `[]` | List of node taints to tolerate. |
 | clusterDomain | string | `"cluster.local"` | Install application cluster domain. |
@@ -532,7 +531,7 @@ helm delete dragonfly --namespace dragonfly-system
 | seedClient.config.gc.policy.distHighThresholdPercent | int | `80` | distHighThresholdPercent is the high threshold percent of the disk usage. If the disk usage is greater than the threshold, dfdaemon will do gc. |
 | seedClient.config.gc.policy.distLowThresholdPercent | int | `60` | distLowThresholdPercent is the low threshold percent of the disk usage. If the disk usage is less than the threshold, dfdaemon will stop gc. |
 | seedClient.config.gc.policy.taskTTL | string | `"21600s"` | taskTTL is the ttl of the task. |
-| seedClient.config.host | string | `nil` | host is the host configuration for dfdaemon. |
+| seedClient.config.host | object | `{"idc":"","location":""}` | host is the host configuration for dfdaemon. |
 | seedClient.config.manager.addrs | list | `[]` | addrs is manager addresses. |
 | seedClient.config.metrics.port | int | `4001` | port is the port to the metrics server. |
 | seedClient.config.proxy.enable | bool | `true` | enable indicates whether enable proxy. |
@@ -548,7 +547,6 @@ helm delete dragonfly --namespace dragonfly-system
 | seedClient.config.server.cacheDir | string | `"/var/cache/dragonfly/dfdaemon/"` | cacheDir is the directory to store cache files. |
 | seedClient.config.server.pluginDir | string | `"/var/lib/dragonfly/plugins/dfdaemon/"` | pluginDir is the directory to store plugins. |
 | seedClient.config.storage.dir | string | `"/var/lib/dragonfly/"` | dir is the directory to store task's metadata and content. |
-| seedClient.config.tracing | string | `nil` | tracing is the tracing configuration for dfdaemon. |
 | seedClient.config.upload.server.port | int | `4000` | port is the port to the grpc server. |
 | seedClient.enable | bool | `false` | Enable seed client. |
 | seedClient.extraVolumeMounts | list | `[{"mountPath":"/var/log/dragonfly/dfdaemon/","name":"logs"}]` | Extra volumeMounts for dfdaemon. |
@@ -586,7 +584,7 @@ helm delete dragonfly --namespace dragonfly-system
 | seedClient.replicas | int | `3` | Number of Pods to launch. |
 | seedClient.resources | object | `{"limits":{"cpu":"2","memory":"4Gi"},"requests":{"cpu":"0","memory":"0"}}` | Pod resource requests and limits. |
 | seedClient.statefulsetAnnotations | object | `{}` | Statefulset annotations. |
-| seedClient.tag | string | `"v0.1.4"` | Image tag. |
+| seedClient.tag | string | `"v0.1.7"` | Image tag. |
 | seedClient.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds. |
 | seedClient.tolerations | list | `[]` | List of node taints to tolerate. |
 | seedPeer.config.aliveTime | string | `"0s"` | Daemon alive time, when sets 0s, daemon will not auto exit, it is useful for longtime running. |

charts/dragonfly/templates/client/client-configmap.yaml

@@ -42,6 +42,10 @@ data:
 {{ toYaml .Values.client.config.security | indent 6 }}
     metrics:
 {{ toYaml .Values.client.config.metrics | indent 6 }}
+    {{- if .Values.client.config.tracing }}
     tracing:
 {{ toYaml .Values.client.config.tracing | indent 6 }}
+    {{- else if .Values.jaeger.enable }}
+    jaeger: http://{{ $.Release.Name }}-jaeger-collector.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}:14268/api/traces
+    {{- end }}
 {{- end }}

charts/dragonfly/templates/seed-client/seed-client-configmap.yaml

@@ -44,6 +44,10 @@ data:
 {{ toYaml .Values.seedClient.config.security | indent 6 }}
     metrics:
 {{ toYaml .Values.seedClient.config.metrics | indent 6 }}
+    {{- if .Values.seedClient.config.tracing }}
     tracing:
 {{ toYaml .Values.seedClient.config.tracing | indent 6 }}
+    {{- else if .Values.jaeger.enable }}
+    jaeger: http://{{ $.Release.Name }}-jaeger-collector.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}:14268/api/traces
+    {{- end }}
 {{- end }}

charts/dragonfly/values.yaml

@@ -796,7 +796,7 @@ seedClient:
   # -- Image repository.
   image: dragonflyoss/client
   # -- Image tag.
-  tag: v0.1.4
+  tag: v0.1.7
   # -- Image pull policy.
   pullPolicy: IfNotPresent
   # -- Image pull secrets.
@@ -863,9 +863,9 @@ seedClient:
     # -- host is the host configuration for dfdaemon.
     host:
       ## idc is the idc of the host.
-      # idc: ""
+      idc: ""
       ## location is the location of the host.
-      # location: ""
+      location: ""
       ## hostname is the hostname of the host.
       # hostname: ""
       ## ip is the advertise ip of the host.
@@ -942,8 +942,8 @@ seedClient:
       port: 4001
       ## ip is the listen ip of the metrics server.
       # ip: ""
-    # -- tracing is the tracing configuration for dfdaemon.
-    tracing:
+    ## tracing is the tracing configuration for dfdaemon.
+    # tracing:
       ## addr is the address to report tracing log.
       # addr: ""
   metrics:
@@ -992,7 +992,7 @@ client:
   # -- Image repository.
   image: dragonflyoss/client
   # -- Image tag.
-  tag: v0.1.4
+  tag: v0.1.7
   # -- Image pull policy.
   pullPolicy: IfNotPresent
   # -- Image pull secrets.
@@ -1041,9 +1041,9 @@ client:
     # -- host is the host configuration for dfdaemon.
     host:
       ## idc is the idc of the host.
-      # idc: ""
+      idc: ""
       ## location is the location of the host.
-      # location: ""
+      location: ""
       ## hostname is the hostname of the host.
       # hostname: ""
       ## ip is the advertise ip of the host.
@@ -1111,8 +1111,8 @@ client:
       port: 4001
       ## ip is the listen ip of the metrics server.
       # ip: ""
-    # -- tracing is the tracing configuration for dfdaemon.
-    tracing:
+    ## tracing is the tracing configuration for dfdaemon.
+    # tracing:
       ## addr is the address to report tracing log.
       # addr: ""
   metrics: