chore: bugfix for dns policy and ca path (#7)

Signed-off-by: Jim Ma <[email protected]>
dragonflyoss · Sep 6, 2021 · 37e7ebf · 37e7ebf
1 parent 7ea7fed
commit 37e7ebf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/charts/dragonfly/Chart.yaml b/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.0"
-appVersion: "0.5.0"
+version: "0.5.1"
+appVersion: "0.5.1"
 keywords:
 - dragonfly
 - d7y

diff --git a/charts/dragonfly/README.md b/charts/dragonfly/README.md
@@ -1,6 +1,6 @@
 # Dragonfly Helm Chart
 
-![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
+![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.1](https://img.shields.io/badge/AppVersion-0.5.1-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.
 

diff --git a/charts/dragonfly/templates/dfdaemon/dfdaemon-daemonset.yaml b/charts/dragonfly/templates/dfdaemon/dfdaemon-daemonset.yaml
@@ -38,6 +38,9 @@ spec:
 {{ toYaml .Values.dfdaemon.nodeSelector | indent 8 }}
       {{- end }}
       hostNetwork: {{ .Values.dfdaemon.hostNetwork }}
+      {{- if .Values.dfdaemon.hostNetwork }}
+      dnsPolicy: "ClusterFirstWithHostNet"
+      {{- end }}
       hostPID: {{ or (and .Values.containerRuntime.docker.enable .Values.containerRuntime.docker.restart) .Values.containerRuntime.containerd.enable .Values.containerRuntime.crio.enable }}
       {{- if .Values.dfdaemon.tolerations }}
       tolerations:
@@ -69,13 +72,13 @@ spec:
         volumeMounts:
         - name: config
           mountPath: "/etc/dragonfly"
-        {{- if and (not .Values.dfdaemon.hostNetwork) .Values.dfdaemon.config.proxy.tcpListen.namespace }}
-        - name: run
-          mountPath: /run/dragonfly
         {{- if .Values.containerRuntime.docker.enable }}
         - name: d7y-ca
           mountPath: /etc/dragonfly-ca
         {{- end }}
+        {{- if and (not .Values.dfdaemon.hostNetwork) .Values.dfdaemon.config.proxy.tcpListen.namespace }}
+        - name: run
+          mountPath: /run/dragonfly
         securityContext:
           capabilities:
             add:
@@ -343,13 +346,13 @@ spec:
               # TODO merge mirrors
               echo "registry $registry found in config.toml, skip"
             else
-                cat << EOF >> $etcContainerd/config.toml
+              cat << EOF >> $etcContainerd/config.toml
           [plugins.cri.registry.mirrors."$domain"]
             endpoint = ["http://127.0.0.1:{{ .Values.dfdaemon.hostPort}}","$registry"]
           EOF
-                echo "Registry $domain added"
-                need_restart=1
-              fi
+              echo "Registry $domain added"
+              need_restart=1
+            fi
           fi
 
           # restart containerd