Merge branch 'kubernetes-sigs:master' into master

Author: modzilla99

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>

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/godbus/dbus v4.1.0+incompatible
 	github.com/imdario/mergo v0.3.7 // indirect
 	github.com/kubernetes-sigs/sig-storage-lib-external-provisioner v4.0.0+incompatible
-	github.com/miekg/dns v1.1.15 // indirect
+	github.com/miekg/dns v1.1.25 // indirect
 	github.com/prometheus/client_golang v1.1.0 // indirect
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect