Merge pull request #107 from almahmoud/master

Add persistence.existingClaim to nfs-ganesha-external-provisioner

Author: k8s-ci-robot

charts/nfs-server-provisioner/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 3.0.0
 description: nfs-server-provisioner is an out-of-tree dynamic provisioner for Kubernetes. You can use it to quickly & easily deploy shared storage that works almost anywhere.
 name: nfs-server-provisioner
-version: 1.4.0
+version: 1.5.0
 maintainers:
 - name: kiall
   email: [email protected]

charts/nfs-server-provisioner/README.md

@@ -72,6 +72,7 @@ their default values.
 | `persistence.storageClass`     | PVC Storage Class for config volume                                                                             | `nil`                                                    |
 | `persistence.accessMode`       | PVC Access Mode for config volume                                                                               | `ReadWriteOnce`                                          |
 | `persistence.size`             | PVC Storage Request for config volume                                                                           | `1Gi`                                                    |
+| `persistence.existingClaim`    | Use an existing Persistent Volume Claim for persistence                                                        | `nil`                                                    |
 | `storageClass.create`          | Enable creation of a StorageClass to consume this nfs-server-provisioner instance                                      | `true`                                                   |
 | `storageClass.provisionerName` | The provisioner name for the storageclass                                                                       | `cluster.local/{release-name}-{chart-name}`              |
 | `storageClass.defaultClass`    | Whether to set the created StorageClass as the clusters default StorageClass                                    | `false`                                                  |

charts/nfs-server-provisioner/templates/statefulset.yaml

@@ -128,6 +128,12 @@ spec:
       {{- end }}
 
   {{- if .Values.persistence.enabled }}
+  {{- if .Values.persistence.existingClaim }}
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: {{ tpl .Values.persistence.existingClaim . }}
+  {{- else }}
   volumeClaimTemplates:
     - metadata:
         name: data
@@ -144,3 +150,4 @@ spec:
           requests:
             storage: {{ .Values.persistence.size | quote }}
   {{- end }}
+  {{- end }}

charts/nfs-server-provisioner/values.yaml

@@ -39,6 +39,14 @@ service:
 
 persistence:
   enabled: false
+  
+  ## Existing Persistent Volume Claim
+  ## This should be used with persistence.enabled=true
+  ## If defined, an existing volume claim will be used, instead
+  ## of creating a new one. i.e. volume definition:
+  ## persistentVolumeClaim:
+  ##   claimName: {{ tpl .Values.persistence.existingClaim . }}
+  # existingClaim: "my-existing-pvc"
 
   ## Persistent Volume Storage Class
   ## If defined, storageClassName: <storageClass>