Merge pull request #100 from yonatankahana/podlabels

Use podLabels with user defined labels in deployment pod template
Bump chart version to 4.0.12
2021-06-28 20:52:40 -07:00 · 2021-06-13 18:13:42 +03:00 · 2021-06-13 08:09:02 -07:00 · 2021-06-10 07:17:06 +02:00 · 2021-05-13 11:28:39 -07:00 · 2021-05-13 21:03:24 +03:00
21 changed files with 134 additions and 85 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
-# v4.0.1
+# v4.0.2
 - Add arm7 (32bit) support (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/58)
+
+# v4.0.1
 - Preserve name of the PV directory name during archiving (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/59)

 # v4.0.0
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 **NFS subdir external provisioner** is an automatic provisioner that use your _existing and already configured_ NFS server to support dynamic provisioning of Kubernetes Persistent Volumes via Persistent Volume Claims. Persistent volumes are provisioned as `${namespace}-${pvcName}-${pvName}`.

 Note: This repository is migrated from https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client. As part of the migration:
- The container image name and repository has changed to `gcr.io/k8s-staging-sig-storage` and `nfs-subdir-external-provisioner` respectively. 
+- The container image name and repository has changed to `k8s.gcr.io/sig-storage` and `nfs-subdir-external-provisioner` respectively.
 - To maintain backward compatibility with earlier deployment files, the naming of NFS Client Provisioner is retained as `nfs-client-provisioner` in the deployment YAMLs.
 - One of the pending areas for development on this repository is to add automated e2e tests. If you would like to contribute, please raise an issue or reach us on the Kubernetes slack #sig-storage channel.

@@ -60,8 +60,7 @@ On OpenShift the service account used to bind volumes does not have the necessar
 $ NAMESPACE=`oc project -q`
 $ sed -i'' "s/namespace:.*/namespace: $NAMESPACE/g" ./deploy/rbac.yaml
 $ oc create -f deploy/rbac.yaml
-$ oc create role use-scc-hostmount-anyuid --verb=use --resource=scc --resource-name=hostmount-anyuid -n $NAMESPACE
-$ oc adm policy add-role-to-user use-scc-hostmount-anyuid system:serviceaccount:$NAMESPACE:nfs-client-provisioner
+$ oc adm policy add-scc-to-user hostmount-anyuid system:serviceaccount:$NAMESPACE:nfs-client-provisioner
 ```

 **Step 4: Configure the NFS subdir external provisioner**
@@ -90,7 +89,7 @@ spec:
      serviceAccountName: nfs-client-provisioner
      containers:
        - name: nfs-client-provisioner
-          image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.1
+          image: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
          volumeMounts:
            - name: nfs-client-root
              mountPath: /persistentvolumes
--- a/charts/nfs-subdir-external-provisioner/Chart.yaml
+++ b/charts/nfs-subdir-external-provisioner/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: 4.0.1
+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.6
+version: 4.0.12
 kubeVersion: ">=1.9.0-0"
 sources:
 - https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner
--- a/charts/nfs-subdir-external-provisioner/README.md
+++ b/charts/nfs-subdir-external-provisioner/README.md
@@ -48,32 +48,38 @@ The command removes all the Kubernetes components associated with the chart and

 The following tables lists the configurable parameters of this chart and their default values.

-| Parameter                           | Description                                                 | Default                                           |
-| ----------------------------------- | ----------------------------------------------------------- | ------------------------------------------------- |
-| `replicaCount`                      | Number of provisioner instances to deployed                 | `1`                                               |
-| `strategyType`                      | Specifies the strategy used to replace old Pods by new ones | `Recreate`                                        |
-| `image.repository`                  | Provisioner image                                           | `gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner` |
-| `image.tag`                         | Version of provisioner image                                | `v4.0.1`                                  |
-| `image.pullPolicy`                  | Image pull policy                                           | `IfNotPresent`                                    |
-| `storageClass.name`                 | Name of the storageClass                                    | `nfs-client`                                      |
-| `storageClass.defaultClass`         | Set as the default StorageClass                             | `false`                                           |
-| `storageClass.allowVolumeExpansion` | Allow expanding the volume                                  | `true`                                            |
-| `storageClass.reclaimPolicy`        | Method used to reclaim an obsoleted volume                  | `Delete`                                          |
-| `storageClass.provisionerName`      | Name of the provisionerName                                 | null                                              |
-| `storageClass.archiveOnDelete`      | Archive PVC when deleting                                   | `true`                                            |
-| `storageClass.onDelete`             | Strategy on PVC deletion. Overrides `archiveOnDelete` when set to lowercase values `delete` or `retain`  | null |
-| `storageClass.pathPattern`          | Specifies a template for the directory name                 | null                                              |
-| `storageClass.accessModes`          | Set access mode for PV                                      | `ReadWriteOnce`                                   |
-| `leaderElection.enabled`            | Enables or disables leader election                         | `true`                                            |
-| `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`                                            |
-| `podSecurityPolicy.enabled`         | Create & use Pod Security Policy resources                  | `false`                                           |
-| `priorityClassName`                 | Set pod priorityClassName                                   | null                                              |
-| `serviceAccount.create`             | Should we create a ServiceAccount                           | `true`                                            |
-| `serviceAccount.name`               | Name of the ServiceAccount to use                           | null                                              |
-| `nodeSelector`                      | Node labels for pod assignment                              | `{}`                                              |
-| `affinity`                          | Affinity settings                                           | `{}`                                              |
-| `tolerations`                       | List of node taints to tolerate                             | `[]`                                              |
+| Parameter                           | Description                                                                                           | Default                                                  |
+| ----------------------------------- | ----------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| `replicaCount`                      | Number of provisioner instances to deployed                                                           | `1`                                                      |
+| `strategyType`                      | Specifies the strategy used to replace old Pods by new ones                                           | `Recreate`                                               |
+| `image.repository`                  | Provisioner image                                                                                     | `k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner` |
+| `image.tag`                         | Version of provisioner image                                                                          | `v4.0.2`                                                 |
+| `image.pullPolicy`                  | Image pull policy                                                                                     | `IfNotPresent`                                           |
+| `imagePullSecrets`                  | Image pull secrets                                                                                    | `[]`                                                     |
+| `storageClass.name`                 | Name of the storageClass                                                                              | `nfs-client`                                             |
+| `storageClass.defaultClass`         | Set as the default StorageClass                                                                       | `false`                                                  |
+| `storageClass.allowVolumeExpansion` | Allow expanding the volume                                                                            | `true`                                                   |
+| `storageClass.reclaimPolicy`        | Method used to reclaim an obsoleted volume                                                            | `Delete`                                                 |
+| `storageClass.provisionerName`      | Name of the provisionerName                                                                           | null                                                     |
+| `storageClass.archiveOnDelete`      | Archive PVC when deleting                                                                             | `true`                                                   |
+| `storageClass.onDelete`             | Strategy on PVC deletion. Overrides archiveOnDelete when set to lowercase values 'delete' or 'retain' | null                                                     |
+| `storageClass.pathPattern`          | Specifies a template for the directory name                                                           | null                                                     |
+| `storageClass.accessModes`          | Set access mode for PV                                                                                | `ReadWriteOnce`                                          |
+| `storageClass.annotations`          | Set additional annotations for the StorageClass                                                       | `{}`                                                     |
+| `leaderElection.enabled`            | Enables or disables leader election                                                                   | `true`                                                   |
+| `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                                                     |
+| `nfs.volumeName`                    | Volume name used inside the pods                                                                      | `nfs-subdir-external-provisioner-root`                   |
+| `resources`                         | Resources required (e.g. CPU, memory)                                                                 | `{}`                                                     |
+| `rbac.create`                       | Use Role-based Access Control                                                                         | `true`                                                   |
+| `podSecurityPolicy.enabled`         | Create & use Pod Security Policy resources                                                            | `false`                                                  |
+| `podAnnotations`                    | Additional annotations for the Pods                                                                   | `{}`                                                     |
+| `priorityClassName`                 | Set pod priorityClassName                                                                             | null                                                     |
+| `serviceAccount.create`             | Should we create a ServiceAccount                                                                     | `true`                                                   |
+| `serviceAccount.name`               | Name of the ServiceAccount to use                                                                     | null                                                     |
+| `serviceAccount.annotations`        | Additional annotations for the ServiceAccount                                                         | `{}`                                                     |
+| `nodeSelector`                      | Node labels for pod assignment                                                                        | `{}`                                                     |
+| `affinity`                          | Affinity settings                                                                                     | `{}`                                                     |
+| `tolerations`                       | List of node taints to tolerate                                                                       | `[]`                                                     |
+| `labels`                            | Additional labels for any resource created                                                            | `{}`                                                     |
--- a/charts/nfs-subdir-external-provisioner/templates/_helpers.tpl
+++ b/charts/nfs-subdir-external-provisioner/templates/_helpers.tpl
@@ -59,4 +59,34 @@ Return the appropriate apiVersion for podSecurityPolicy.
 {{- else -}}
 {{- print "extensions/v1beta1" -}}
 {{- end -}}
-{{- end -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "nfs-subdir-external-provisioner.labels" -}}
+chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
+heritage: {{ .Release.Service }}
+{{ include "nfs-subdir-external-provisioner.selectorLabels" . }}
+{{- with .Values.labels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
+{{- end }}
+
+{{/*
+Pod template labels
+*/}}
+{{- define "nfs-subdir-external-provisioner.podLabels" -}}
+{{ include "nfs-subdir-external-provisioner.selectorLabels" . }}
+{{- with .Values.labels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "nfs-subdir-external-provisioner.selectorLabels" -}}
+app: {{ template "nfs-subdir-external-provisioner.name" . }}
+release: {{ .Release.Name }}
+{{- end }}
--- a/charts/nfs-subdir-external-provisioner/templates/clusterrole.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/clusterrole.yaml
@@ -3,12 +3,12 @@ kind: ClusterRole
 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 }}
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
  name: {{ template "nfs-subdir-external-provisioner.fullname" . }}-runner
 rules:
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get", "list", "watch"]
  - apiGroups: [""]
    resources: ["persistentvolumes"]
    verbs: ["get", "list", "watch", "create", "delete"]
--- a/charts/nfs-subdir-external-provisioner/templates/clusterrolebinding.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/clusterrolebinding.yaml
@@ -3,10 +3,7 @@ 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 }}
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
  name: run-{{ template "nfs-subdir-external-provisioner.fullname" . }}
 subjects:
  - kind: ServiceAccount
--- a/charts/nfs-subdir-external-provisioner/templates/deployment.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/deployment.yaml
@@ -3,27 +3,25 @@ kind: Deployment
 metadata:
  name: {{ template "nfs-subdir-external-provisioner.fullname" . }}
  labels:
-    app: {{ template "nfs-subdir-external-provisioner.name" . }}
-    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
 spec:
  replicas: {{ .Values.replicaCount }}
  strategy:
    type: {{ .Values.strategyType }}
  selector:
    matchLabels:
-      app: {{ template "nfs-subdir-external-provisioner.name" . }}
-      release: {{ .Release.Name }}
+      {{- include "nfs-subdir-external-provisioner.selectorLabels" . | nindent 6 }}
  template:
    metadata:
      annotations:
+      {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      {{- if and (.Values.tolerations) (semverCompare "<1.6-0" .Capabilities.KubeVersion.GitVersion) }}
        scheduler.alpha.kubernetes.io/tolerations: '{{ toJson .Values.tolerations }}'
      {{- end }}
      labels:
-        app: {{ template "nfs-subdir-external-provisioner.name" . }}
-        release: {{ .Release.Name }}
+        {{- include "nfs-subdir-external-provisioner.podLabels" . | nindent 8 }}
    spec:
      serviceAccountName: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }}
      {{- if .Values.nodeSelector }}
@@ -37,16 +35,16 @@ spec:
      {{- if .Values.priorityClassName }}
      priorityClassName: {{ .Values.priorityClassName | quote }}
      {{- end }}
-      {{- if .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
      imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 8 }}
+        {{- toYaml . | nindent 8 }}
      {{- end }}
      containers:
        - name: {{ .Chart.Name }}
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          volumeMounts:
-            - name: nfs-subdir-external-provisioner-root
+            - name: {{ .Values.nfs.volumeName }}
              mountPath: /persistentvolumes
          env:
            - name: PROVISIONER_NAME
@@ -64,7 +62,7 @@ spec:
 {{ toYaml . | indent 12 }}
          {{- end }}
      volumes:
-        - name: nfs-subdir-external-provisioner-root
+        - name: {{ .Values.nfs.volumeName }}
 {{- if .Values.buildMode }}
          emptyDir: {}
 {{- else if .Values.nfs.mountOptions }}
--- a/charts/nfs-subdir-external-provisioner/templates/persistentvolume.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/persistentvolume.yaml
@@ -4,6 +4,7 @@ kind: PersistentVolume
 metadata:
  name: pv-{{ template "nfs-subdir-external-provisioner.fullname" . }}
  labels: 
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
    nfs-subdir-external-provisioner: {{ template "nfs-subdir-external-provisioner.fullname" . }}
 spec:
  capacity:
--- a/charts/nfs-subdir-external-provisioner/templates/persistentvolumeclaim.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/persistentvolumeclaim.yaml
@@ -3,6 +3,8 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
  name: pvc-{{ template "nfs-subdir-external-provisioner.fullname" . }}
+  labels:
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
 spec:
  accessModes:
    - {{ .Values.storageClass.accessModes }}
--- a/charts/nfs-subdir-external-provisioner/templates/podsecuritypolicy.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/podsecuritypolicy.yaml
@@ -4,10 +4,7 @@ kind: PodSecurityPolicy
 metadata:
  name: {{ template "nfs-subdir-external-provisioner.fullname" . }}
  labels:
-    app: {{ template "nfs-subdir-external-provisioner.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
 spec:
  privileged: false
  allowPrivilegeEscalation: false
--- a/charts/nfs-subdir-external-provisioner/templates/role.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/role.yaml
@@ -3,10 +3,7 @@ kind: Role
 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 }}
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
  name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }}
 rules:
  - apiGroups: [""]
--- a/charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml
@@ -3,10 +3,7 @@ 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 }}
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
  name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }}
 subjects:
  - kind: ServiceAccount
--- a/charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml
@@ -3,9 +3,10 @@ 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 }}
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
  name: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }}
 {{- end -}}
--- a/charts/nfs-subdir-external-provisioner/templates/storageclass.yaml
+++ b/charts/nfs-subdir-external-provisioner/templates/storageclass.yaml
@@ -3,15 +3,15 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
  labels:
-    app: {{ template "nfs-subdir-external-provisioner.name" . }}
-    chart: {{ template "nfs-subdir-external-provisioner.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }}
  name: {{ .Values.storageClass.name }}
-{{- if .Values.storageClass.defaultClass }}
  annotations:
+  {{- if .Values.storageClass.defaultClass }}
    storageclass.kubernetes.io/is-default-class: "true"
-{{- end }}
+  {{- end }}
+  {{- with .Values.storageClass.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 provisioner: {{ template "nfs-subdir-external-provisioner.provisionerName" . }}
 allowVolumeExpansion: {{ .Values.storageClass.allowVolumeExpansion }}
 reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }}
--- a/charts/nfs-subdir-external-provisioner/values.yaml
+++ b/charts/nfs-subdir-external-provisioner/values.yaml
@@ -2,14 +2,16 @@ replicaCount: 1
 strategyType: Recreate

 image:
-  repository: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner
-  tag: v4.0.1
+  repository: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner
+  tag: v4.0.2
  pullPolicy: IfNotPresent
+imagePullSecrets: []

 nfs:
  server:
  path: /nfs-storage
  mountOptions:
+  volumeName: nfs-subdir-external-provisioner-root

 # For creating the StorageClass automatically:
 storageClass:
@@ -47,6 +49,9 @@ storageClass:
  # Set access mode - ReadWriteOnce, ReadOnlyMany or ReadWriteMany
  accessModes: ReadWriteOnce

+  # Storage class annotations
+  annotations: {}
+
 leaderElection:
  # When set to false leader election will be disabled
  enabled: true
@@ -61,6 +66,9 @@ rbac:
 podSecurityPolicy:
  enabled: false

+# Deployment pod annotations
+podAnnotations: {}
+
 ## Set pod priorityClassName
 # priorityClassName: ""

@@ -68,6 +76,9 @@ serviceAccount:
  # Specifies whether a ServiceAccount should be created
  create: true

+  # Annotations to add to the service account
+  annotations: {}
+
  # The name of the ServiceAccount to use.
  # If not set and create is true, a name is generated using the fullname template
  name:
@@ -85,3 +96,6 @@ nodeSelector: {}
 tolerations: []

 affinity: {}
+
+# Additional labels for any resource created
+labels: {}
--- a/cmd/nfs-subdir-external-provisioner/provisioner.go
+++ b/cmd/nfs-subdir-external-provisioner/provisioner.go
@@ -104,8 +104,10 @@ func (p *nfsProvisioner) Provision(ctx context.Context, options controller.Provi
 	pathPattern, exists := options.StorageClass.Parameters["pathPattern"]
 	if exists {
 		customPath := metadata.stringParser(pathPattern)
-		path = filepath.Join(p.path, customPath)
-		fullPath = filepath.Join(mountPath, customPath)
+		if customPath != "" {
+			path = filepath.Join(p.path, customPath)
+			fullPath = filepath.Join(mountPath, customPath)
+		}
 	}

 	glog.V(4).Infof("creating path %s", fullPath)
--- a/deploy/deployment.yaml
+++ b/deploy/deployment.yaml
@@ -21,7 +21,7 @@ spec:
      serviceAccountName: nfs-client-provisioner
      containers:
        - name: nfs-client-provisioner
-          image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.1
+          image: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
          volumeMounts:
            - name: nfs-client-root
              mountPath: /persistentvolumes
--- a/deploy/objects/clusterrole.yaml
+++ b/deploy/objects/clusterrole.yaml
@@ -3,6 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
  name: nfs-client-provisioner-runner
 rules:
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get", "list", "watch"]
  - apiGroups: [""]
    resources: ["persistentvolumes"]
    verbs: ["get", "list", "watch", "create", "delete"]
--- a/deploy/objects/deployment.yaml
+++ b/deploy/objects/deployment.yaml
@@ -14,7 +14,7 @@ spec:
      serviceAccountName: nfs-client-provisioner
      containers:
        - name: nfs-client-provisioner
-          image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.1
+          image: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
          volumeMounts:
            - name: nfs-client-root
              mountPath: /persistentvolumes
--- a/deploy/rbac.yaml
+++ b/deploy/rbac.yaml
@@ -10,6 +10,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
  name: nfs-client-provisioner-runner
 rules:
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get", "list", "watch"]
  - apiGroups: [""]
    resources: ["persistentvolumes"]
    verbs: ["get", "list", "watch", "create", "delete"]
Author	SHA1	Message	Date
Kubernetes Prow Robot	5c0dd02dfb	Merge pull request #100 from yonatankahana/podlabels Use podLabels with user defined labels in deployment pod template	2021-06-28 20:52:40 -07:00
Yonatan Kahana	6b5f99c430	Bump chart version to 4.0.12 Signed-off-by: Yonatan Kahana <yonatankahana.il@gmail.com>	2021-06-13 18:13:42 +03:00
Kubernetes Prow Robot	65ce8894da	Merge pull request #110 from equinix-ms/master chart: Add option to set nfs root volume name.	2021-06-13 08:09:02 -07:00
Robin Elfrink	23c664fd54	chart: Add option to set nfs root volume name. Signed-off-by: Robin Elfrink <robin.elfrink@eu.equinix.com>	2021-06-10 07:17:06 +02:00
Kubernetes Prow Robot	5e1b342945	Merge pull request #92 from yonatankahana/no-staging-in-readme Update the README file with stable image repository	2021-05-13 11:28:39 -07:00
Yonatan Kahana	4ee25693f5	Use podLabels with user defined labels in deployment pod template Signed-off-by: Yonatan Kahana <yonatankahana.il@gmail.com>	2021-05-13 21:03:24 +03:00
Kubernetes Prow Robot	ba1654f02c	Merge pull request #65 from johnsimcall/patch-1 Fix README.md	2021-05-11 09:54:37 -07:00
John Call	09a32a7aad	also remove the command that creates an unnecessary SCC	2021-05-11 10:43:59 -06:00
Kubernetes Prow Robot	ae50b6da6c	Merge pull request #71 from khalsa-ji/bugfix/provisioningFails-storageclassWith-WaitForFirstConsumer PV provisioning fails when storageclass has volumeBindingMode as 'WaitForFirstConsumer'	2021-04-29 12:16:12 -07:00
Ravikiran Singh	2cad8da61c	PV provisioning fails when storageclass has volumeBindingMode as 'WaitForFirstConsumer': 1. Adds RBAC permissions to get nodes in the cluster. 2. Bumps the chart version	2021-04-28 13:03:50 +05:30
Yonatan Kahana	d8db2d111e	Update the README file with stable image repository Signed-off-by: Yonatan Kahana <yonatankahana.il@gmail.com>	2021-04-25 22:43:05 +03:00
Kubernetes Prow Robot	7947697c42	Merge pull request #72 from yonatankahana/chart-labels-and-annotations Helm chart labels and annotations and add missing image pull secrets in documentation	2021-04-23 06:24:02 -07:00
Yonatan Kahana	1cafa67771	Merge branch 'master' of https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner into chart-labels-and-annotations	2021-04-22 14:44:40 +03:00
Kubernetes Prow Robot	48e51b160c	Merge pull request #89 from yonatankahana/promoted-4.0.2 Update image location after v4.0.2 promoted from the temporary staging repository	2021-04-14 09:36:40 -07:00
Yonatan Kahana	9a5d466349	Update image location after v4.0.2 promoted from the temporary staging repository Signed-off-by: Yonatan Kahana <yonatankahana.il@gmail.com>	2021-04-14 15:01:34 +03:00
yonatankahana	466cf8be73	Update storageclass.yaml to include annotations even when defaultClass is false Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>	2021-04-13 18:04:36 +03:00
Yonatan Kahana	172cab36f1	Merge branch 'chart-labels-and-annotations' of github.com:yonatankahana/nfs-subdir-external-provisioner into chart-labels-and-annotations	2021-04-07 19:15:18 +03:00
Yonatan Kahana	a3f57e1527	Merge branch 'master' of github.com:kubernetes-sigs/nfs-subdir-external-provisioner into chart-labels-and-annotations	2021-04-07 19:15:01 +03:00
Kubernetes Prow Robot	eae7143d98	Merge pull request #83 from MiaoZhou/fixEmptyCustomPath prevent mounting of root directory	2021-04-01 22:16:11 -07:00
Kubernetes Prow Robot	888d6dbd39	Merge pull request #82 from yonatankahana/v4.0.2-prep Bump version to 4.0.2	2021-04-01 22:10:11 -07:00
zhoumiao	b8e203661b	prevent mounting of root directory If storageClass enable pathPattern like: `pathPattern: "${.PVC.annotations.nfs.io/storage-path}"` but pvc without annotation would make empty `customPath` and create a pv with nfs root path.	2021-03-31 21:23:20 +08:00
Yonatan Kahana	cadce2dbc9	Bump version to 4.0.2 Signed-off-by: Yonatan Kahana <yonatankahana.il@gmail.com>	2021-03-30 11:04:36 +03:00
yonatankahana	012a016471	Update charts/nfs-subdir-external-provisioner/templates/_helpers.tpl Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>	2021-03-22 16:48:19 +02:00
Yonatan Kahana	c53f80160a	Use selectorLabels in deployment pod template Signed-off-by: Yonatan Kahana <yonatankahana.il@gmail.com>	2021-03-17 19:03:49 +02:00
Yonatan Kahana	a5117cbedb	Helm chart labels and annotations and add missing image pull secrets in documentation Signed-off-by: Yonatan Kahana <yonatankahana.il@gmail.com>	2021-03-12 00:34:45 +02:00
Yonatan Kahana	681319b3bd	Merge branch 'master' of github.com:kubernetes-sigs/nfs-subdir-external-provisioner into chart-labels-and-annotations	2021-03-12 00:31:02 +02:00
Yonatan Kahana	74123487f2	Helm chart labels and annotations support Signed-off-by: Yonatan Kahana <yonatankahana.il@gmail.com>	2021-03-12 00:28:49 +02:00
John Call	0869cb9ec6	Fix README.md The previous `oc adm policy add-role-to-user use-scc-hostmount-anyuid` command was incorrect. Replacing it with the correct one	2021-03-04 12:26:13 -07:00