Rename charts, remove depracation notices from README and update URLs.

README.md

@@ -19,12 +19,16 @@ To note again, you must _already_ have an NFS Server.
 
 ### With Helm
 
-Follow the instructions for the stable helm chart maintained at https://github.com/helm/charts/tree/master/stable/nfs-client-provisioner
+Follow the instructions from the helm chart [README](deploy/helm/README.md).
 
 The tl;dr is
 
-```bash
-$ helm install stable/nfs-client-provisioner --set nfs.server=x.x.x.x --set nfs.path=/exported/path
+```console
+$ git clone https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner.git
+$ cd nfs-subdir-external-provisioner/deploy/helm/
+$ helm install nfs-subdir-external-provisioner . \
+    --set nfs.server=x.x.x.x \
+    --set nfs.path=/exported/path
 ```
 
 ### Without Helm

charts/nfs-subdir-external-provisioner/.helmignore

@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj

charts/nfs-subdir-external-provisioner/Chart.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-appVersion: 3.1.0
-description: DEPRECATED - nfs-client is an automatic provisioner that used your *already configured* NFS server, automatically creating Persistent Volumes.
-name: nfs-client-provisioner
-home: https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client
-version: 1.2.11
-sources:
-- https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client
-deprecated: true
-keywords:
-- nfs
-- storage

charts/nfs-subdir-external-provisioner/templates/clusterrolebinding.yaml

@@ -1,19 +0,0 @@
-{{- if .Values.rbac.create }}
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  labels:
-    app: {{ template "nfs-client-provisioner.name" . }}
-    chart: {{ template "nfs-client-provisioner.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: run-{{ template "nfs-client-provisioner.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "nfs-client-provisioner.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: ClusterRole
-  name: {{ template "nfs-client-provisioner.fullname" . }}-runner
-  apiGroup: rbac.authorization.k8s.io
-{{- end }}

charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml

@@ -1,19 +0,0 @@
-{{- if .Values.rbac.create }}
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  labels:
-    app: {{ template "nfs-client-provisioner.name" . }}
-    chart: {{ template "nfs-client-provisioner.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: leader-locking-{{ template "nfs-client-provisioner.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "nfs-client-provisioner.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: leader-locking-{{ template "nfs-client-provisioner.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io
-{{- end }}

charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml

@@ -1,11 +0,0 @@
-{{ if .Values.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: {{ template "nfs-client-provisioner.name" . }}
-    chart: {{ template "nfs-client-provisioner.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "nfs-client-provisioner.serviceAccountName" . }}
-{{- end -}}

deploy/helm/Chart.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+appVersion: 3.1.0
+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: 3.0.0
+kubeVersion: ">=1.9.0 <1.20.0"
+sources:
+- https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner
+keywords:
+- nfs
+- storage
+- provisioner

deploy/helm/README.md

@@ -1,31 +1,26 @@
-# ⚠️ Repo Archive Notice
+# NFS Subdirectory External Provisioner Helm Chart
 
-As of Nov 13, 2020, charts in this repo will no longer be updated.
-For more information, see the Helm Charts [Deprecation and Archive Notice](https://github.com/helm/charts#%EF%B8%8F-deprecation-and-archive-notice), and [Update](https://helm.sh/blog/charts-repo-deprecation/).
-
-# nfs-client-provisioner
-
-The [NFS client provisioner](https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client) is an automatic provisioner for Kubernetes that uses your *already configured* NFS server, automatically creating Persistent Volumes.
-
-## DEPRECATION NOTICE
-
-This chart is deprecated and no longer supported.
+The [NFS subdir external provisioner](https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner) is an automatic provisioner for Kubernetes that uses your *already configured* NFS server, automatically creating Persistent Volumes.
 
 ## TL;DR;
 
 ```console
-$ helm install --set nfs.server=x.x.x.x --set nfs.path=/exported/path stable/nfs-client-provisioner
+$ git clone https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner.git
+$ cd nfs-subdir-external-provisioner/deploy/helm/
+$ helm install nfs-subdir-external-provisioner . \
+    --set nfs.server=x.x.x.x \
+    --set nfs.path=/exported/path
 ```
 
 For **arm** deployments set `image.repository` to `--set image.repository=quay.io/external_storage/nfs-client-provisioner-arm`
 
 ## Introduction
 
-This charts installs custom [storage class](https://kubernetes.io/docs/concepts/storage/storage-classes/) into a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. It also installs a [NFS client provisioner](https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client) into the cluster which dynamically creates persistent volumes from single NFS share.
+This charts installs custom [storage class](https://kubernetes.io/docs/concepts/storage/storage-classes/) into a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. It also installs a [NFS client provisioner](https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner) into the cluster which dynamically creates persistent volumes from single NFS share.
 
 ## Prerequisites
 
-- Kubernetes 1.9+
+- Kubernetes >=1.9, <1.20
 - Existing NFS Share
 
 ## Installing the Chart
@@ -33,7 +28,9 @@ This charts installs custom [storage class](https://kubernetes.io/docs/concepts/
 To install the chart with the release name `my-release`:
 
 ```console
-$ helm install --name my-release --set nfs.server=x.x.x.x --set nfs.path=/exported/path stable/nfs-client-provisioner
+$ helm install my-release . \
+    --set nfs.server=x.x.x.x \
+    --set nfs.path=/exported/path```
 ```
 
 The command deploys the given storage class in the default configuration. It can be used afterswards to provision persistent volumes. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@@ -68,8 +65,8 @@ The following tables lists the configurable parameters of this chart and their d
 | `storageClass.provisionerName`      | Name of the provisionerName                                 | null                                              |
 | `storageClass.archiveOnDelete`      | Archive pvc when deleting                                   | `true`                                            |
 | `storageClass.accessModes`          | Set access mode for PV                                      | `ReadWriteOnce`                                   |
-| `nfs.server`                        | Hostname of the NFS server                                  | null (ip or hostname)                             |
-| `nfs.path`                          | Basepath of the mount point to be used                      | `/ifs/kubernetes`                                 |
+| `nfs.server`                        | Hostname of the NFS server (required)                       | null (ip or hostname)                             |
+| `nfs.path`                          | Basepath of the mount point to be used                      | `/nfs-storage`                                 |
 | `nfs.mountOptions`                  | Mount options (e.g. 'nfsvers=3')                            | null                                              |
 | `resources`                         | Resources required (e.g. CPU, memory)                       | `{}`                                              |
 | `rbac.create`                       | Use Role-based Access Control                               | `true`                                            |

deploy/helm/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "nfs-client-provisioner.name" -}}
+{{- define "nfs-subdir-external-provisioner.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "nfs-client-provisioner.fullname" -}}
+{{- define "nfs-subdir-external-provisioner.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,24 +27,24 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "nfs-client-provisioner.chart" -}}
+{{- define "nfs-subdir-external-provisioner.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "nfs-client-provisioner.provisionerName" -}}
+{{- define "nfs-subdir-external-provisioner.provisionerName" -}}
 {{- if .Values.storageClass.provisionerName -}}
 {{- printf .Values.storageClass.provisionerName -}}
 {{- else -}}
-cluster.local/{{ template "nfs-client-provisioner.fullname" . -}}
+cluster.local/{{ template "nfs-subdir-external-provisioner.fullname" . -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "nfs-client-provisioner.serviceAccountName" -}}
+{{- define "nfs-subdir-external-provisioner.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "nfs-client-provisioner.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "nfs-subdir-external-provisioner.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}

deploy/helm/templates/clusterrole.yaml

@@ -3,11 +3,11 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-    app: {{ template "nfs-client-provisioner.name" . }}
-    chart: {{ template "nfs-client-provisioner.chart" . }}
+    app: {{ template "nfs-subdir-external-provisioner.name" . }}
+    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "nfs-client-provisioner.fullname" . }}-runner
+  name: {{ template "nfs-subdir-external-provisioner.fullname" . }}-runner
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -25,6 +25,6 @@ rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [{{ template "nfs-client-provisioner.fullname" . }}]
+    resourceNames:  [{{ template "nfs-subdir-external-provisioner.fullname" . }}]
 {{- end }}
 {{- end }}

deploy/helm/templates/clusterrolebinding.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.rbac.create }}
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  labels:
+    app: {{ template "nfs-subdir-external-provisioner.name" . }}
+    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: run-{{ template "nfs-subdir-external-provisioner.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: {{ template "nfs-subdir-external-provisioner.fullname" . }}-runner
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}

deploy/helm/templates/deployment.yaml

@@ -1,10 +1,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "nfs-client-provisioner.fullname" . }}
+  name: {{ template "nfs-subdir-external-provisioner.fullname" . }}
   labels:
-    app: {{ template "nfs-client-provisioner.name" . }}
-    chart: {{ template "nfs-client-provisioner.chart" . }}
+    app: {{ template "nfs-subdir-external-provisioner.name" . }}
+    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
 spec:
@@ -13,7 +13,7 @@ spec:
     type: {{ .Values.strategyType }}
   selector:
     matchLabels:
-      app: {{ template "nfs-client-provisioner.name" . }}
+      app: {{ template "nfs-subdir-external-provisioner.name" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
@@ -22,10 +22,10 @@ spec:
         scheduler.alpha.kubernetes.io/tolerations: '{{ toJson .Values.tolerations }}'
       {{- end }}
       labels:
-        app: {{ template "nfs-client-provisioner.name" . }}
+        app: {{ template "nfs-subdir-external-provisioner.name" . }}
         release: {{ .Release.Name }}
     spec:
-      serviceAccountName: {{ template "nfs-client-provisioner.serviceAccountName" . }}
+      serviceAccountName: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
@@ -46,11 +46,11 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
-            - name: nfs-client-root
+            - name: nfs-subdir-external-provisioner-root
               mountPath: /persistentvolumes
           env:
             - name: PROVISIONER_NAME
-              value: {{ template "nfs-client-provisioner.provisionerName" . }}
+              value: {{ template "nfs-subdir-external-provisioner.provisionerName" . }}
             - name: NFS_SERVER
               value: {{ .Values.nfs.server }}
             - name: NFS_PATH
@@ -60,12 +60,12 @@ spec:
 {{ toYaml . | indent 12 }}
           {{- end }}
       volumes:
-        - name: nfs-client-root
+        - name: nfs-subdir-external-provisioner-root
 {{- if .Values.buildMode }}
           emptyDir: {}
 {{- else if .Values.nfs.mountOptions }}
           persistentVolumeClaim:
-            claimName: pvc-{{ template "nfs-client-provisioner.fullname" . }}
+            claimName: pvc-{{ template "nfs-subdir-external-provisioner.fullname" . }}
 {{- else }}
           nfs:
             server: {{ .Values.nfs.server }}

deploy/helm/templates/persistentvolume.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-{{ template "nfs-client-provisioner.fullname" . }}
+  name: pv-{{ template "nfs-subdir-external-provisioner.fullname" . }}
   labels: 
-    nfs-client-provisioner: {{ template "nfs-client-provisioner.fullname" . }}
+    nfs-subdir-external-provisioner: {{ template "nfs-subdir-external-provisioner.fullname" . }}
 spec:
   capacity:
     storage: 10Mi

deploy/helm/templates/persistentvolumeclaim.yaml

@@ -2,7 +2,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: pvc-{{ template "nfs-client-provisioner.fullname" . }}
+  name: pvc-{{ template "nfs-subdir-external-provisioner.fullname" . }}
 spec:
   accessModes:
     - {{ .Values.storageClass.accessModes }}
@@ -10,7 +10,7 @@ spec:
   storageClassName: ""
   selector:
     matchLabels:
-      nfs-client-provisioner: {{ template "nfs-client-provisioner.fullname" . }}
+      nfs-subdir-external-provisioner: {{ template "nfs-subdir-external-provisioner.fullname" . }}
   resources:
     requests:
       storage: 10Mi

deploy/helm/templates/podsecuritypolicy.yaml

@@ -2,9 +2,9 @@
 apiVersion: {{ template "podSecurityPolicy.apiVersion" . }}
 kind: PodSecurityPolicy
 metadata:
-  name: {{ template "nfs-client-provisioner.fullname" . }}
+  name: {{ template "nfs-subdir-external-provisioner.fullname" . }}
   labels:
-    app: {{ template "nfs-client-provisioner.name" . }}
+    app: {{ template "nfs-subdir-external-provisioner.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}

deploy/helm/templates/role.yaml

@@ -3,11 +3,11 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-    app: {{ template "nfs-client-provisioner.name" . }}
-    chart: {{ template "nfs-client-provisioner.chart" . }}
+    app: {{ template "nfs-subdir-external-provisioner.name" . }}
+    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: leader-locking-{{ template "nfs-client-provisioner.fullname" . }}
+  name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }}
 rules:
   - apiGroups: [""]
     resources: ["endpoints"]
@@ -16,6 +16,6 @@ rules:
   - apiGroups:      ['extensions']
     resources:      ['podsecuritypolicies']
     verbs:          ['use']
-    resourceNames:  [{{ template "nfs-client-provisioner.fullname" . }}]
+    resourceNames:  [{{ template "nfs-subdir-external-provisioner.fullname" . }}]
 {{- end }}
 {{- end }}

deploy/helm/templates/rolebinding.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.rbac.create }}
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  labels:
+    app: {{ template "nfs-subdir-external-provisioner.name" . }}
+    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+  name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}

deploy/helm/templates/serviceaccount.yaml

@@ -0,0 +1,11 @@
+{{ if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: {{ template "nfs-subdir-external-provisioner.name" . }}
+    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }}
+{{- end -}}

deploy/helm/templates/storageclass.yaml

@@ -3,8 +3,8 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   labels:
-    app: {{ template "nfs-client-provisioner.name" . }}
-    chart: {{ template "nfs-client-provisioner.chart" . }}
+    app: {{ template "nfs-subdir-external-provisioner.name" . }}
+    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ .Values.storageClass.name }}
@@ -12,7 +12,7 @@ metadata:
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
 {{- end }}
-provisioner: {{ template "nfs-client-provisioner.provisionerName" . }}
+provisioner: {{ template "nfs-subdir-external-provisioner.provisionerName" . }}
 allowVolumeExpansion: {{ .Values.storageClass.allowVolumeExpansion }}
 reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }}
 parameters:

deploy/helm/values.yaml

@@ -1,7 +1,3 @@
-# Default values for nfs-client-provisioner.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
 replicaCount: 1
 strategyType: Recreate
 
@@ -12,7 +8,7 @@ image:
 
 nfs:
   server:
-  path: /ifs/kubernetes
+  path: /nfs-storage
   mountOptions:
 
 # For creating the StorageClass automatically: