From 584dc27a9e7af23913d27d6b2c7e4e2c6b351e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Haukur=20Flygenring?= Date: Fri, 10 Sep 2021 09:41:17 +0000 Subject: [PATCH 1/5] * New value in values.yaml that allows you to have different reclaimPolicies for the StorageClass and the NFS PV. Closes issue; https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/issues/128 --- .../templates/persistentvolume.yaml | 2 +- charts/nfs-subdir-external-provisioner/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/nfs-subdir-external-provisioner/templates/persistentvolume.yaml b/charts/nfs-subdir-external-provisioner/templates/persistentvolume.yaml index 88eb04d1..9d6ba4d5 100644 --- a/charts/nfs-subdir-external-provisioner/templates/persistentvolume.yaml +++ b/charts/nfs-subdir-external-provisioner/templates/persistentvolume.yaml @@ -12,7 +12,7 @@ spec: volumeMode: Filesystem accessModes: - {{ .Values.storageClass.accessModes }} - persistentVolumeReclaimPolicy: {{ .Values.storageClass.reclaimPolicy }} + persistentVolumeReclaimPolicy: {{ .Values.nfs.reclaimPolicy }} storageClassName: "" {{- if .Values.nfs.mountOptions }} mountOptions: diff --git a/charts/nfs-subdir-external-provisioner/values.yaml b/charts/nfs-subdir-external-provisioner/values.yaml index 0a4f03dc..1f911e7e 100644 --- a/charts/nfs-subdir-external-provisioner/values.yaml +++ b/charts/nfs-subdir-external-provisioner/values.yaml @@ -12,6 +12,7 @@ nfs: path: /nfs-storage mountOptions: volumeName: nfs-subdir-external-provisioner-root + reclaimPolicy: Delete # Reclaim policy for the main nfs volume # For creating the StorageClass automatically: storageClass: From f1ea3f760bbdadb3f57d3ea63d9b924c7fc3def1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Haukur=20Flygenring?= Date: Fri, 10 Sep 2021 12:21:25 +0000 Subject: [PATCH 2/5] Set the default reclaimPolicy for the NFS pv to Retain. --- charts/nfs-subdir-external-provisioner/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nfs-subdir-external-provisioner/values.yaml b/charts/nfs-subdir-external-provisioner/values.yaml index 1f911e7e..0a324cf9 100644 --- a/charts/nfs-subdir-external-provisioner/values.yaml +++ b/charts/nfs-subdir-external-provisioner/values.yaml @@ -12,7 +12,7 @@ nfs: path: /nfs-storage mountOptions: volumeName: nfs-subdir-external-provisioner-root - reclaimPolicy: Delete # Reclaim policy for the main nfs volume + reclaimPolicy: Retain # Reclaim policy for the main nfs volume # For creating the StorageClass automatically: storageClass: From 48fab9587f6fa45ef4662f5dd451f1b5ec1e1e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Haukur=20Flygenring?= Date: Mon, 27 Sep 2021 12:54:30 +0000 Subject: [PATCH 3/5] Bump patch version --- charts/nfs-subdir-external-provisioner/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nfs-subdir-external-provisioner/Chart.yaml b/charts/nfs-subdir-external-provisioner/Chart.yaml index 99c3d079..58d3174a 100644 --- a/charts/nfs-subdir-external-provisioner/Chart.yaml +++ b/charts/nfs-subdir-external-provisioner/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 4.0.2 description: nfs-subdir-external-provisioner is an automatic provisioner that used your *already configured* NFS server, automatically creating Persistent Volumes. name: nfs-subdir-external-provisioner home: https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner -version: 4.0.13 +version: 4.0.14 kubeVersion: ">=1.9.0-0" sources: - https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner From 5fe7e4afff97d970b4a1df40e4600c14ada29e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Haukur=20Flygenring?= Date: Mon, 27 Sep 2021 16:49:05 +0000 Subject: [PATCH 4/5] * Change comment location --- charts/nfs-subdir-external-provisioner/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/nfs-subdir-external-provisioner/values.yaml b/charts/nfs-subdir-external-provisioner/values.yaml index 0a324cf9..20720b19 100644 --- a/charts/nfs-subdir-external-provisioner/values.yaml +++ b/charts/nfs-subdir-external-provisioner/values.yaml @@ -12,7 +12,8 @@ nfs: path: /nfs-storage mountOptions: volumeName: nfs-subdir-external-provisioner-root - reclaimPolicy: Retain # Reclaim policy for the main nfs volume + # Reclaim policy for the main nfs volume + reclaimPolicy: Retain # For creating the StorageClass automatically: storageClass: From ba68ff69463b3478dc66490685a6d8a44bb7f10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Haukur=20Flygenring?= Date: Thu, 30 Sep 2021 11:22:55 +0000 Subject: [PATCH 5/5] Updated documentation. --- charts/nfs-subdir-external-provisioner/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/nfs-subdir-external-provisioner/README.md b/charts/nfs-subdir-external-provisioner/README.md index 0055e79e..c131f362 100644 --- a/charts/nfs-subdir-external-provisioner/README.md +++ b/charts/nfs-subdir-external-provisioner/README.md @@ -71,6 +71,7 @@ The following tables lists the configurable parameters of this chart and their d | `nfs.path` | Basepath of the mount point to be used | `/nfs-storage` | | `nfs.mountOptions` | Mount options (e.g. 'nfsvers=3') | null | | `nfs.volumeName` | Volume name used inside the pods | `nfs-subdir-external-provisioner-root` | +| `nfs.reclaimPolicy` | Reclaim policy for the main nfs volume used for subdir provisioning | `Retain` | | `resources` | Resources required (e.g. CPU, memory) | `{}` | | `rbac.create` | Use Role-based Access Control | `true` | | `podSecurityPolicy.enabled` | Create & use Pod Security Policy resources | `false` |