fix: manager addrs is empty in client and seed client (#216)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Jan 3, 2024 · 11be6f4 · 11be6f4
1 parent 24603ea
commit 11be6f4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 56 deletions.
diff --git a/charts/dragonfly/Chart.yaml b/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.12
+version: 1.1.13
 appVersion: 2.1.28
 keywords:
   - dragonfly
@@ -26,9 +26,7 @@ sources:
 
 annotations:
   artifacthub.io/changes: |
-    - Add client template to dragonfly charts.
-    - Add seed client template to dragonfly charts.
-    - Update dragonfly image tag to v2.1.28.
+    - Fix manager addrs in client and seed client.
 
   artifacthub.io/links: |
     - name: Chart Source

diff --git a/charts/dragonfly/README.md b/charts/dragonfly/README.md
@@ -175,10 +175,6 @@ helm delete dragonfly --namespace dragonfly-system
 | client.name | string | `"client"` | Client name. |
 | client.nameOverride | string | `""` | Override scheduler name. |
 | client.nodeSelector | object | `{}` | Node labels for pod assignment. |
-| client.persistence.accessModes | list | `["ReadWriteOnce"]` | Persistence access modes. |
-| client.persistence.annotations | object | `{}` | Persistence annotations. |
-| client.persistence.enable | bool | `true` | Enable persistence for peer. |
-| client.persistence.size | string | `"50Gi"` | Persistence persistence size. |
 | client.podAnnotations | object | `{}` | Pod annotations. |
 | client.podLabels | object | `{}` | Pod labels. |
 | client.priorityClassName | string | `""` | Pod priorityClassName. |

diff --git a/charts/dragonfly/templates/client/client-configmap.yaml b/charts/dragonfly/templates/client/client-configmap.yaml
@@ -21,8 +21,8 @@ data:
 {{ toYaml .Values.client.config.upload | indent 6 }}
     manager:
       addrs:
-      {{- if .Values.client.config.scheduler.manager.addrs }}
-{{ toYaml .Values.client.config.scheduler.manager.netAddrs | indent 6 }}
+      {{- if .Values.client.config.manager.addrs }}
+{{ toYaml .Values.client.config.manager.netAddrs | indent 6 }}
       {{- else if .Values.manager.enable }}
       - {{ template "dragonfly.manager.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.manager.grpcPort }}
       {{- else }}

diff --git a/charts/dragonfly/templates/client/client-daemonset.yaml b/charts/dragonfly/templates/client/client-daemonset.yaml
@@ -112,34 +112,11 @@ spec:
       - name: config
         configMap:
           name: {{ template "dragonfly.client.fullname" . }}
-      {{- if not (.Values.client.persistence.enable) }}
       - name: storage
-        emptyDir: {}
-      {{- end }}
+        hostPath:
+          path: {{ .Values.client.config.storage.dir }}
+          type: DirectoryOrCreate
       {{- if .Values.client.extraVolumes }}
       {{- toYaml .Values.client.extraVolumes | nindent 6 }}
       {{- end }}
-  {{- if .Values.client.persistence.enable }}
-  volumeClaimTemplates:
-    - metadata:
-        name: storage
-        {{- range $key, $value := .Values.client.persistence.annotations }}
-          {{ $key }}: {{ $value }}
-        {{- end }}
-      spec:
-        accessModes:
-          {{- range .Values.client.persistence.accessModes }}
-          - {{ . | quote }}
-          {{- end }}
-        resources:
-          requests:
-            storage: {{ .Values.client.persistence.size | quote }}
-      {{- if .Values.client.persistence.storageClass }}
-      {{- if (eq "-" .Values.client.persistence.storageClass) }}
-        storageClassName: ""
-      {{- else }}
-        storageClassName: "{{ .Values.client.persistence.storageClass }}"
-      {{- end }}
-      {{- end }}
-  {{- end }}
 {{- end }}
diff --git a/charts/dragonfly/templates/seed-client/seed-client-configmap.yaml b/charts/dragonfly/templates/seed-client/seed-client-configmap.yaml
@@ -21,8 +21,8 @@ data:
 {{ toYaml .Values.seedClient.config.upload | indent 6 }}
     manager:
       addrs:
-      {{- if .Values.client.config.scheduler.manager.addrs }}
-{{ toYaml .Values.client.config.scheduler.manager.netAddrs | indent 6 }}
+      {{- if .Values.client.config.manager.addrs }}
+{{ toYaml .Values.client.config.manager.netAddrs | indent 6 }}
       {{- else if .Values.manager.enable }}
       - {{ template "dragonfly.manager.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.manager.grpcPort }}
       {{- else }}

diff --git a/charts/dragonfly/values.yaml b/charts/dragonfly/values.yaml
@@ -1037,24 +1037,6 @@ client:
   extraVolumeMounts:
     - name: logs
       mountPath: "/var/log/dragonfly/dfdaemon/"
-  persistence:
-    # -- Enable persistence for peer.
-    enable: true
-    # -- Persistence annotations.
-    annotations: {}
-    # -- Persistence access modes.
-    accessModes:
-      - ReadWriteOnce
-    # -- Persistence persistence size.
-    size: 50Gi
-    ## Client data Persistent Volume Storage Class.
-    ## If defined, storageClassName: <storageClass>.
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning.
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack).
-    ##
-    # storageClass: "-".
   config:
     # -- host is the host configuration for dfdaemon.
     host: