server: add option to set policy package PVC name via values; #238

Author: rdimaio

charts/rucio-server/Chart.yaml

@@ -1,5 +1,5 @@
 name: rucio-server
-version: 36.0.8
+version: 36.0.9
 apiVersion: v1
 description: A Helm chart to deploy servers for Rucio
 keywords:

charts/rucio-server/templates/_helpers.tpl

@@ -62,3 +62,15 @@ Ensures the registry ends with a `/` if set.
     {{- trimSuffix "/" .Values.imageRegistry }}/
   {{- end -}}
 {{- end -}}
+
+{{/*
+Generate policy package PVC Name
+Prepends the release name to the policy package PVC name if specified in values.
+*/}}
+{{- define "rucio.pvc.claimName" -}}
+  {{- if and .Values.policyPackages.enabled .Values.policyPackages.pvc.prependReleaseName -}}
+    {{ .Release.Name }}-{{ .Values.policyPackages.pvc.name }}
+  {{- else -}}
+    {{ .Values.policyPackages.pvc.name }}
+  {{- end -}}
+{{- end -}}

charts/rucio-server/templates/deployment.yaml

@@ -69,7 +69,7 @@ spec:
       {{- if .Values.policyPackages.enabled }}
       - name: policy-package-volume
         persistentVolumeClaim:
-          claimName: policy-package-volume
+          claimName: {{ include "rucio.pvc.claimName" . }}
       {{- end }}
       {{- range $key, $val := .Values.secretMounts }}
       - name: {{ coalesce $val.volumeName $val.secretName $val.secretFullName }}

charts/rucio-server/templates/policy-package-storage.yaml

@@ -1,8 +1,8 @@
-{{- if .Values.policyPackages.enabled }}
+{{- if .Values.policyPackages.pvc.createPvc }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: policy-package-volume
+  name: {{ include "rucio.pvc.claimName" . }}
 spec:
   storageClassName: {{ .Values.policyPackages.storageClass.name }}
   accessModes:

charts/rucio-server/values.yaml

@@ -178,6 +178,12 @@ policyPackages:
     # - moduleName: vo_2_policy_package
     #   requirement: git+https://github.com/vo-2/[email protected]
     #   version: 0.1.0
+  pvc:
+    # Set true to create a PVC for the policy packages; leave false if providing it separately.
+    createPvc: false
+    name: policy-package-volume
+    # Whether to prepend the release name to the PVC name provided.
+    prependReleaseName: true
   resources:
     requests:
       # Storage required by the policy packages - resize if needed