[stable/nfs-client-provisioner] Fix compatibility issue with 1.16 (#18132)

* Fix psp for 1.16

Signed-off-by: Markus Schlotbohm <markus_schlotbohm@as-gmbh.de>

* Bump Char version of nfs-client-provisioner

Signed-off-by: Markus Schlotbohm <markus_schlotbohm@as-gmbh.de>

* Add semverCompare for apiVersion compatibility

Signed-off-by: Markus Schlotbohm <markus_schlotbohm@as-gmbh.de>

stable/nfs-client-provisioner/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 3.1.0
 description: 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.6
+version: 1.2.7
 sources:
 - https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client
 maintainers:

stable/nfs-client-provisioner/templates/_helpers.tpl

@@ -49,3 +49,14 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for podSecurityPolicy.
+*/}}
+{{- define "podSecurityPolicy.apiVersion" -}}
+{{- if semverCompare ">=1.10-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "policy/v1beta1" -}}
+{{- else -}}
+{{- print "extensions/v1beta1" -}}
+{{- end -}}
+{{- end -}}

stable/nfs-client-provisioner/templates/podsecuritypolicy.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.podSecurityPolicy.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "podSecurityPolicy.apiVersion" . }}
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "nfs-client-provisioner.fullname" . }}