Skip to content

Commit

Permalink
feat: add verbose args to client command (#220)
Browse files Browse the repository at this point in the history
Signed-off-by: Gaius <[email protected]>
  • Loading branch information
gaius-qi authored Jan 4, 2024
1 parent d58e97b commit 40b7ad4
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 8 deletions.
9 changes: 5 additions & 4 deletions charts/dragonfly/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.16
version: 1.1.17
appVersion: 2.1.28
keywords:
- dragonfly
Expand All @@ -26,7 +26,8 @@ sources:

annotations:
artifacthub.io/changes: |
- Change default value of announceInterval.
- Add verbose args to client command.
- Update client image version to v0.1.10.
artifacthub.io/links: |
- name: Chart Source
Expand All @@ -39,9 +40,9 @@ annotations:
- name: scheduler
image: dragonflyoss/scheduler:v2.1.28
- name: client
image: dragonflyoss/client:v0.1.7
image: dragonflyoss/client:v0.1.10
- name: seed-client
image: dragonflyoss/client:v0.1.7
image: dragonflyoss/client:v0.1.10
- name: dfdaemon
image: dragonflyoss/dfdaemon:v2.1.28
- name: trainer
Expand Down
6 changes: 4 additions & 2 deletions charts/dragonfly/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ helm delete dragonfly --namespace dragonfly-system
| 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.upload.server.port | int | `4000` | port is the port to the grpc server. |
| client.config.verbose | bool | `false` | verbose prints log. |
| client.enable | bool | `false` | Enable client. |
| client.extraVolumeMounts | list | `[{"mountPath":"/var/log/dragonfly/dfdaemon/","name":"logs"}]` | Extra volumeMounts for dfdaemon. |
| client.extraVolumes | list | `[{"emptyDir":{},"name":"logs"}]` | Extra volumes for dfdaemon. |
Expand Down Expand Up @@ -182,7 +183,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.7"` | Image tag. |
| client.tag | string | `"v0.1.10"` | 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. |
Expand Down Expand Up @@ -548,6 +549,7 @@ helm delete dragonfly --namespace dragonfly-system
| 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.upload.server.port | int | `4000` | port is the port to the grpc server. |
| seedClient.config.verbose | bool | `false` | verbose prints log. |
| seedClient.enable | bool | `false` | Enable seed client. |
| seedClient.extraVolumeMounts | list | `[{"mountPath":"/var/log/dragonfly/dfdaemon/","name":"logs"}]` | Extra volumeMounts for dfdaemon. |
| seedClient.extraVolumes | list | `[{"emptyDir":{},"name":"logs"}]` | Extra volumes for dfdaemon. |
Expand Down Expand Up @@ -584,7 +586,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.7"` | Image tag. |
| seedClient.tag | string | `"v0.1.10"` | 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. |
Expand Down
4 changes: 4 additions & 0 deletions charts/dragonfly/templates/client/client-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ spec:
- name: client
image: {{ .Values.client.image }}:{{ .Values.client.tag }}
imagePullPolicy: {{ .Values.client.pullPolicy | quote }}
{{- if .Values.client.config.verbose }}
args:
- --verbose
{{- end }}
resources:
{{ toYaml .Values.client.resources | indent 12 }}
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ spec:
- name: seed-client
image: "{{ .Values.seedClient.image }}:{{ .Values.seedClient.tag }}"
imagePullPolicy: {{ .Values.seedClient.pullPolicy | quote }}
{{- if .Values.seedClient.config.verbose }}
args:
- --verbose
{{- end }}
resources:
{{ toYaml .Values.seedClient.resources | indent 12 }}
env:
Expand Down
8 changes: 6 additions & 2 deletions charts/dragonfly/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ seedClient:
# -- Image repository.
image: dragonflyoss/client
# -- Image tag.
tag: v0.1.7
tag: v0.1.10
# -- Image pull policy.
pullPolicy: IfNotPresent
# -- Image pull secrets.
Expand Down Expand Up @@ -860,6 +860,8 @@ seedClient:
##
# storageClass: "-".
config:
# -- verbose prints log.
verbose: false
# -- host is the host configuration for dfdaemon.
host:
## idc is the idc of the host.
Expand Down Expand Up @@ -992,7 +994,7 @@ client:
# -- Image repository.
image: dragonflyoss/client
# -- Image tag.
tag: v0.1.7
tag: v0.1.10
# -- Image pull policy.
pullPolicy: IfNotPresent
# -- Image pull secrets.
Expand Down Expand Up @@ -1038,6 +1040,8 @@ client:
- name: logs
mountPath: "/var/log/dragonfly/dfdaemon/"
config:
# -- verbose prints log.
verbose: false
# -- host is the host configuration for dfdaemon.
host:
## idc is the idc of the host.
Expand Down

0 comments on commit 40b7ad4

Please sign in to comment.