single: allow overriding pvc names for deployment

charts/victoria-logs-single/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Added ability to override PVC name for Deployment
 
 ## 0.7.1
 

charts/victoria-logs-single/templates/server-deployment.yaml

@@ -148,7 +148,7 @@ spec:
         - name: server-volume
           {{- if $app.persistentVolume.enabled }}
           persistentVolumeClaim:
-            claimName: {{ $app.persistentVolume.existingClaim | default $fullname }}
+            claimName: {{ $app.persistentVolume.existingClaim | default $app.persistentVolume.name | default $fullname }}
           {{- else }}
           emptyDir: {{ toYaml $app.emptyDir | nindent 12 }}
           {{- end }}

charts/victoria-logs-single/templates/server-pvc.yaml

@@ -1,27 +1,30 @@
-{{- if .Values.server.persistentVolume.enabled -}}
-{{- if not .Values.server.statefulSet.enabled -}}
-{{- if not .Values.server.persistentVolume.existingClaim -}}
+{{- $app := .Values.server }}
+{{- $pvc := $app.persistentVolume }}
+{{- if $pvc.enabled -}}
+{{- if not $app.statefulSet.enabled -}}
+{{- if not $pvc.existingClaim -}}
 {{- $ctx := dict "helm" . "appKey" "server" }}
+{{- $fullname := include "vm.plain.fullname" $ctx }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ include "vm.plain.fullname" $ctx }}
+  name: {{ $pvc.name | default $fullname }}
   namespace: {{ include "vm.namespace" . }}
-  {{- with .Values.server.persistentVolume.annotations  }}
+  {{- with $pvc.annotations  }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}
   labels: {{ include "vm.labels" $ctx | nindent 4 }}
 spec:
- {{- with .Values.server.persistentVolume.accessModes }}
+ {{- with $pvc.accessModes }}
   accessModes: {{ toYaml . | nindent 4 }}
   {{- end }}
   resources:
     requests:
-      storage: {{ .Values.server.persistentVolume.size }}
-  {{- with .Values.server.persistentVolume.storageClassName }}
+      storage: {{ $pvc.size }}
+  {{- with $pvc.storageClassName }}
   storageClassName: {{ . }}
   {{- end }}
-  {{- with .Values.server.persistentVolume.matchLabels }}
+  {{- with $pvc.matchLabels }}
   selector:
     matchLabels: {{ toYaml . | nindent 6 }}
   {{- end }}

charts/victoria-logs-single/values.yaml

@@ -122,6 +122,9 @@ server:
     # -- Create/use Persistent Volume Claim for server component. Empty dir if false
     enabled: false
 
+    # -- Override Persistent Volume Claim name
+    name: ""
+
     # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Details are [here](http://kubernetes.io/docs/user-guide/persistent-volumes/)
     accessModes:
       - ReadWriteOnce

charts/victoria-metrics-single/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - replaced chart templates with common ones
 - multiple paths for a host in ingress
+- Added ability to override PVC name for Deployment
 
 ## 0.12.3
 

charts/victoria-metrics-single/templates/server-deployment.yaml

@@ -265,7 +265,7 @@ spec:
         - name: server-volume
           {{- if $app.persistentVolume.enabled }}
           persistentVolumeClaim:
-            claimName: {{ $app.persistentVolume.existingClaim | default $fullname }}
+            claimName: {{ $app.persistentVolume.existingClaim | default $app.persistentVolume.name | default $fullname }}
           {{- else }}
           emptyDir: {{ toYaml $app.emptyDir | nindent 12 }}
           {{- end }}

charts/victoria-metrics-single/templates/server-pvc.yaml

@@ -1,29 +1,30 @@
 {{- $app := .Values.server }}
-{{- if $app.persistentVolume.enabled -}}
+{{- $pvc := $app.persistentVolume }}
+{{- if $pvc.enabled -}}
 {{- if not $app.statefulSet.enabled -}}
-{{- if not $app.persistentVolume.existingClaim -}}
+{{- if not $pvc.existingClaim -}}
 {{- $ctx := dict "helm" . "appKey" "server" }}
 {{- $fullname := include "vm.plain.fullname" $ctx }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ $fullname }}
+  name: {{ $pvc.name | default $fullname }}
   namespace: {{ include "vm.namespace" . }}
-  {{- with $app.persistentVolume.annotations  }}
+  {{- with $pvc.annotations  }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}
   labels: {{ include "vm.labels" $ctx | nindent 4 }}
 spec:
-  {{- with $app.persistentVolume.accessModes }}
+  {{- with $pvc.accessModes }}
   accessModes: {{ toYaml . | nindent 4 }}
   {{- end }}
   resources:
     requests:
-      storage: {{ $app.persistentVolume.size }}
-  {{- with $app.persistentVolume.storageClassName }}
+      storage: {{ $pvc.size }}
+  {{- with $pvc.storageClassName }}
   storageClassName: {{ . }}
   {{- end }}
-  {{- with $app.persistentVolume.matchLabels }}
+  {{- with $pvc.matchLabels }}
   selector:
     matchLabels: {{ toYaml . | nindent 6 }}
   {{- end }}

charts/victoria-metrics-single/values.yaml

@@ -163,6 +163,9 @@ server:
     # -- Create/use Persistent Volume Claim for server component. Empty dir if false
     enabled: true
 
+    # -- Override Persistent Volume Claim name
+    name: ""
+
     # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Details are [here](http://kubernetes.io/docs/user-guide/persistent-volumes/)
     accessModes:
       - ReadWriteOnce