feat: add dfdaemon data dir (#33)

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

charts/dragonfly/Chart.yaml

@@ -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/en/images/logo/dragonfly.svg
 type: application
-version: "0.5.25"
-appVersion: "0.5.25"
+version: "0.5.26"
+appVersion: "0.5.26"
 keywords:
 - dragonfly
 - d7y
@@ -18,7 +18,7 @@ sources:
 
 annotations:
   artifacthub.io/changes: |
-    - Update image version to v2.0.2-alpha.2
+    - Update image version to v2.0.2-alpha.3
     - Support custom directory configuration
   artifacthub.io/links: |
     - name: Chart Source
@@ -27,13 +27,13 @@ annotations:
       url: https://github.com/dragonflyoss/Dragonfly2
   artifacthub.io/images: |
     - name: manager
-      image: dragonflyoss/manager:v2.0.2-alpha.2
+      image: dragonflyoss/manager:v2.0.2-alpha.3
     - name: cdn
-      image: dragonflyoss/cdn:v2.0.2-alpha.2
+      image: dragonflyoss/cdn:v2.0.2-alpha.3
     - name: dfdaemon
-      image: dragonflyoss/dfdaemon:v2.0.2-alpha.2
+      image: dragonflyoss/dfdaemon:v2.0.2-alpha.3
     - name: scheduler
-      image: dragonflyoss/scheduler:v2.0.2-alpha.2
+      image: dragonflyoss/scheduler:v2.0.2-alpha.3
 
 dependencies:
 - name: mysql

charts/dragonfly/README.md

@@ -1,6 +1,6 @@
 # Dragonfly Helm Chart
 
-![Version: 0.5.25](https://img.shields.io/badge/Version-0.5.25-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.25](https://img.shields.io/badge/AppVersion-0.5.25-informational?style=flat-square)
+![Version: 0.5.26](https://img.shields.io/badge/Version-0.5.26-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.26](https://img.shields.io/badge/AppVersion-0.5.26-informational?style=flat-square)
 
 Provide efficient, stable, secure, low-cost file and image distribution services to be the best practice and standard solution in the related Cloud-Native area.
 
@@ -174,7 +174,7 @@ helm delete dragonfly --namespace dragonfly-system
 | cdn.resources | object | `{"limits":{"cpu":"4","memory":"8Gi"},"requests":{"cpu":"0","memory":"0"}}` | Pod resource requests and limits |
 | cdn.service | object | `{"extraPorts":[{"name":"http-nginx","port":8001,"targetPort":8001}],"port":8003,"targetPort":8003,"type":"ClusterIP"}` | Service configuration |
 | cdn.statefulsetAnnotations | object | `{}` | Statefulset annotations |
-| cdn.tag | string | `"v2.0.2-alpha.2"` | Image tag |
+| cdn.tag | string | `"v2.0.2-alpha.3"` | Image tag |
 | cdn.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds |
 | cdn.tolerations | list | `[]` | List of node taints to tolerate |
 | clusterDomain | string | `"cluster.local"` | Install application cluster domain |
@@ -196,6 +196,7 @@ helm delete dragonfly --namespace dragonfly-system
 | containerRuntime.initContainerImage | string | `"dragonflyoss/openssl"` | The image name of init container, need include openssl for ca generating |
 | dfdaemon.config.aliveTime | string | `"0s"` | Daemon alive time, when sets 0s, daemon will not auto exit, it is useful for longtime running |
 | dfdaemon.config.cacheDir | string | `""` | Dynconfig cache storage directory |
+| dfdaemon.config.dataDir | string | `"/var/lib/dragonfly"` | Daemon data storage directory |
 | dfdaemon.config.download.calculateDigest | bool | `true` | Calculate digest, when only pull images, can be false to save cpu and memory |
 | dfdaemon.config.download.downloadGRPC.security | object | `{"insecure":true}` | Download grpc security option |
 | dfdaemon.config.download.downloadGRPC.unixListen | object | `{"socket":"/tmp/dfdamon.sock"}` | Download service listen address current, only support unix domain socket |
@@ -258,7 +259,7 @@ helm delete dragonfly --namespace dragonfly-system
 | dfdaemon.priorityClassName | string | `""` | Pod priorityClassName |
 | dfdaemon.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | dfdaemon.resources | object | `{"limits":{"cpu":"2","memory":"2Gi"},"requests":{"cpu":"0","memory":"0"}}` | Pod resource requests and limits |
-| dfdaemon.tag | string | `"v2.0.2-alpha.2"` | Image tag |
+| dfdaemon.tag | string | `"v2.0.2-alpha.3"` | Image tag |
 | dfdaemon.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds |
 | dfdaemon.tolerations | list | `[]` | List of node taints to tolerate |
 | externalManager.grpcPort | int | `65003` | External GRPC service port |
@@ -316,7 +317,7 @@ helm delete dragonfly --namespace dragonfly-system
 | manager.service.annotations | object | `{}` | Service annotations |
 | manager.service.labels | object | `{}` | Service labels |
 | manager.service.type | string | `"ClusterIP"` | Service type |
-| manager.tag | string | `"v2.0.2-alpha.2"` | Image tag |
+| manager.tag | string | `"v2.0.2-alpha.3"` | Image tag |
 | manager.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds |
 | manager.tolerations | list | `[]` | List of node taints to tolerate |
 | mysql.auth.database | string | `"manager"` | Mysql database name |
@@ -374,7 +375,7 @@ helm delete dragonfly --namespace dragonfly-system
 | scheduler.replicas | int | `3` | Number of Pods to launch |
 | scheduler.resources | object | `{"limits":{"cpu":"4","memory":"8Gi"},"requests":{"cpu":"0","memory":"0"}}` | Pod resource requests and limits |
 | scheduler.statefulsetAnnotations | object | `{}` | Statefulset annotations |
-| scheduler.tag | string | `"v2.0.2-alpha.2"` | Image tag |
+| scheduler.tag | string | `"v2.0.2-alpha.3"` | Image tag |
 | scheduler.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds |
 | scheduler.tolerations | list | `[]` | List of node taints to tolerate |
 

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

@@ -16,6 +16,7 @@ data:
     keepStorage: {{ .Values.dfdaemon.config.keepStorage }}
     workHome: {{ .Values.dfdaemon.config.workHome }}
     cacheDir: {{ .Values.dfdaemon.config.cacheDir }}
+    dataDir: {{ .Values.dfdaemon.config.dataDir }}
     logDir: {{ .Values.dfdaemon.config.logDir }}
     verbose: {{ .Values.dfdaemon.config.verbose }}
     {{- if .Values.dfdaemon.config.verbose }}

charts/dragonfly/templates/dfdaemon/dfdaemon-daemonset.yaml

@@ -130,7 +130,7 @@ spec:
         - name: run
           mountPath: /run/dragonfly
         - name: data
-          mountPath: {{ .Values.dfdaemon.config.workHome }}
+          mountPath: {{ .Values.dfdaemon.config.dataDir }}
         securityContext:
           capabilities:
             add:
@@ -501,7 +501,7 @@ spec:
       - name: data
         {{- if .Values.dfdaemon.mountDataDirAsHostPath }}
         hostPath:
-          path: {{ .Values.dfdaemon.config.workHome }}
+          path: {{ .Values.dfdaemon.config.dataDir }}
           type: DirectoryOrCreate
         {{- else }}
         emptyDir: {}

charts/dragonfly/values.yaml

@@ -124,7 +124,7 @@ scheduler:
   # -- Image repository
   image: dragonflyoss/scheduler
   # -- Image tag
-  tag: v2.0.2-alpha.2
+  tag: v2.0.2-alpha.3
   # -- Image pull policy
   pullPolicy: IfNotPresent
   # -- Host Aliases
@@ -236,7 +236,7 @@ cdn:
   # -- Image repository
   image: dragonflyoss/cdn
   # -- Image tag
-  tag: v2.0.2-alpha.2
+  tag: v2.0.2-alpha.3
   # -- Image pull policy
   pullPolicy: IfNotPresent
   # -- Host Aliases
@@ -402,7 +402,7 @@ dfdaemon:
   # -- Image repository
   image: dragonflyoss/dfdaemon
   # -- Image tag
-  tag: v2.0.2-alpha.2
+  tag: v2.0.2-alpha.3
   # -- Image pull policy
   pullPolicy: IfNotPresent
   # -- Host Aliases
@@ -466,6 +466,8 @@ dfdaemon:
     cacheDir: ""
     # -- Log storage directory
     logDir: ""
+    # -- Daemon data storage directory
+    dataDir: "/var/lib/dragonfly"
     # -- When enable, pprof will be enabled
     verbose: true
     pprofPort: 0
@@ -595,7 +597,7 @@ manager:
   # -- Image repository
   image: dragonflyoss/manager
   # -- Image tag
-  tag: v2.0.2-alpha.2
+  tag: v2.0.2-alpha.3
   # -- Image pull policy
   pullPolicy: IfNotPresent
   # -- Host Aliases