Merge 02e3cc8 into 680d2e0

apache · May 14, 2024 · 9dd55b2 · 9dd55b2
2 parents 680d2e0 + 02e3cc8
commit 9dd55b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
@@ -109,10 +109,10 @@ spec:
           volumeMounts:
             - mountPath: "/opt/dolphinscheduler/logs"
               name: {{ include "dolphinscheduler.fullname" . }}-master
-            {{- include "dolphinscheduler.sharedStorage.volumeMount" . | nindent 12 }}
             - name: config-volume
               mountPath: /opt/dolphinscheduler/conf/common.properties
               subPath: common.properties
+            {{- include "dolphinscheduler.sharedStorage.volumeMount" . | nindent 12 }}
             {{- include "dolphinscheduler.etcd.ssl.volumeMount" . | nindent 12 }}
       volumes:
         - name: {{ include "dolphinscheduler.fullname" . }}-master
@@ -122,10 +122,10 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
-        {{- include "dolphinscheduler.sharedStorage.volume" . | nindent 8 }}
         - name: config-volume
           configMap:
             name: {{ include "dolphinscheduler.fullname" . }}-configs
+        {{- include "dolphinscheduler.sharedStorage.volume" . | nindent 8 }}
         {{- include "dolphinscheduler.etcd.ssl.volume" . | nindent 8 }}
   {{- if .Values.master.persistentVolumeClaim.enabled }}
   volumeClaimTemplates:

diff --git a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
@@ -133,11 +133,6 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
-        {{- else }}
-        - name: {{ include "dolphinscheduler.fullname" . }}-worker-data
-          emptyDir: {}
-        - name: {{ include "dolphinscheduler.fullname" . }}-worker-logs
-          emptyDir: {}
         {{- end }}
         - name: config-volume
           configMap: