chore(charts): add vmagent volume

Author: duanhongyi

charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-statefulset.yaml

@@ -75,14 +75,31 @@ spec:
             path: /health
             port: 8429
         volumeMounts:
-        - name: empty-dir
+        {{- if .Values.vmagent.persistence.enabled }}
+        - name: victoriametrics-vmagent-data
           mountPath: /data
+        {{- end }}
         - name: victoriametrics-vmagent-config
           readOnly: true
           mountPath: /opt/drycc/victoriametrics/config
       volumes:
-      - name: empty-dir
-        emptyDir: {}
       - name: victoriametrics-vmagent-config
         configMap:
           name: victoriametrics-vmagent-config
+  {{- if .Values.vmagent.persistence.enabled }}
+  volumeClaimTemplates:
+  - metadata:
+      name: victoriametrics-vmagent-data
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      {{- if .Values.vmagent.persistence.storageClass }}
+      {{- if (eq "-" .Values.vmagent.persistence.storageClass) }}
+      storageClassName: ""
+      {{- else }}
+      storageClassName: "{{ .Values.vmagent.persistence.storageClass }}"
+      {{- end }}
+      {{- end }}
+      resources:
+        requests:
+          storage: {{ .Values.vmagent.persistence.size | quote }}
+  {{- end }}

charts/victoriametrics/templates/victoriametrics/vmstorage/vmstorage-statefulset.yaml

@@ -34,10 +34,7 @@ spec:
         args:
         - vmstorage
         - --httpListenAddr=:8482
-        {{- if .Values.vmstorage.temporary.enabled }}
-        - --temporaryDataPath=/data/temporary
-        {{- end }}
-        - --storageDataPath=/data/storage
+        - --storageDataPath=/data
         - --vminsertAddr=:8400
         - --vmselectAddr=:8401
         {{- if .Values.vmstorage.extraArgs }}
@@ -63,38 +60,15 @@ spec:
           httpGet:
             path: /health
             port: 8482
-        {{- if or .Values.vmstorage.temporary.enabled .Values.vmstorage.persistence.enabled }}
-        volumeMounts:
-        {{- if .Values.vmstorage.temporary.enabled }}
-        - name: victoriametrics-vmstorage-temporary
-          mountPath: /data/temporary
-        {{- end }}
         {{- if .Values.vmstorage.persistence.enabled }}
-        - name: victoriametrics-vmstorage-storage
-          mountPath: /data/storage
-        {{- end }}
+        volumeMounts:
+        - name: victoriametrics-vmstorage-data
+          mountPath: /data
         {{- end }}
-  {{- if or .Values.vmstorage.temporary.enabled .Values.vmstorage.persistence.enabled }}
-  volumeClaimTemplates:
-  {{- if .Values.vmstorage.temporary.enabled }}
-  - metadata:
-      name: victoriametrics-vmstorage-temporary
-    spec:
-      accessModes: [ "ReadWriteOnce" ]
-      {{- if .Values.vmstorage.temporary.storageClass }}
-      {{- if (eq "-" .Values.vmstorage.temporary.storageClass) }}
-      storageClassName: ""
-      {{- else }}
-      storageClassName: "{{ .Values.vmstorage.temporary.storageClass }}"
-      {{- end }}
-      {{- end }}
-      resources:
-        requests:
-          storage: {{ .Values.vmstorage.temporary.size | quote }}
-  {{- end }}
   {{- if .Values.vmstorage.persistence.enabled }}
+  volumeClaimTemplates:
   - metadata:
-      name: victoriametrics-vmstorage-storage
+      name: victoriametrics-vmstorage-data
     spec:
       accessModes: [ "ReadWriteOnce" ]
       {{- if .Values.vmstorage.persistence.storageClass }}
@@ -108,4 +82,3 @@ spec:
         requests:
           storage: {{ .Values.vmstorage.persistence.size | quote }}
   {{- end }}
-  {{- end }}

charts/victoriametrics/values.yaml

@@ -46,6 +46,10 @@ vmagent:
   - --remoteWrite.sendTimeout=30s
   - --remoteWrite.maxRowsPerBlock=300000
   prometheus: ""
+  persistence:
+    enabled: false
+    size: 5Gi
+    storageClass: ""
 
 ## victoriametrics vminsert configuration
 ##
@@ -113,10 +117,6 @@ vmstorage:
     #   memory: 30Mi
   extraArgs:
   - --retentionPeriod=30d
-  temporary:
-    enabled: false
-    size: 5Gi
-    storageClass: ""
   persistence:
     enabled: false
     size: 5Gi