Merge branch 'master' of…

.cloudbuild.sh

-./release-tools/cloudbuild.sh
\ No newline at end of file

.cloudbuild.sh

+#! /bin/bash
+
+# Copyright 2020 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+: ${CSI_PROW_BUILD_PLATFORMS:="linux amd64; linux arm -arm; linux arm64 -arm64; linux ppc64le -ppc64le; linux s390x -s390x"}
+
+# shellcheck disable=SC1091
+. release-tools/cloudbuild.sh

CHANGELOG.md

+# 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
 - Remove redundant field in the rbac.yaml (https://github.com/kubernetes-retired/external-storage/pull/970)
 - Use `kubernetes-sigs/sig-storage-lib-external-provisioner` instead of `incubator/external-storage/lib` (https://github.com/kubernetes-retired/external-storage/pull/1026)

OWNERS

@@ -6,3 +6,4 @@ approvers:
   - kmova
   - jackielii
   - ashishranjan738
+  - yonatankahana

README.md

@@ -90,7 +90,7 @@ spec:
       serviceAccountName: nfs-client-provisioner
       containers:
         - name: nfs-client-provisioner
-          image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.0
+          image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.2
           volumeMounts:
             - name: nfs-client-root
               mountPath: /persistentvolumes

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

 apiVersion: v1
-appVersion: 4.0.0
+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.5
+version: 4.0.8
 kubeVersion: ">=1.9.0-0"
 sources:
 - https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner

charts/nfs-subdir-external-provisioner/README.md

@@ -49,11 +49,11 @@ 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.0`                                                         |
+| `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`                                                     |
@@ -61,7 +61,8 @@ The following tables lists the configurable parameters of this chart and their d
 | `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.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                                                       | `{}`                                                             |

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

@@ -20,6 +20,9 @@ parameters:
   {{- if .Values.storageClass.pathPattern }}
   pathPattern: "{{ .Values.storageClass.pathPattern }}"
   {{- end }}
+  {{- if .Values.storageClass.onDelete }}
+  onDelete: "{{ .Values.storageClass.onDelete }}"
+  {{- end }}
 {{- if .Values.nfs.mountOptions }}
 mountOptions:
   {{- range .Values.nfs.mountOptions }}

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

@@ -3,7 +3,7 @@ strategyType: Recreate
 
 image:
   repository: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner
-  tag: v4.0.0
+  tag: v4.0.2
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 
@@ -36,6 +36,11 @@ storageClass:
   # When set to false your PVs will not be archived by the provisioner upon deletion of the PVC.
   archiveOnDelete: true
 
+  # If it exists and has 'delete' value, delete the directory. If it exists and has 'retain' value, save the directory.
+  # Overrides archiveOnDelete.
+  # Ignored if value not set.
+  onDelete:
+
   # Specifies a template for creating a directory path via PVC metadata's such as labels, annotations, name or namespace.
   # Ignored if value not set.
   pathPattern:

cmd/nfs-subdir-external-provisioner/provisioner.go

@@ -104,9 +104,11 @@ func (p *nfsProvisioner) Provision(ctx context.Context, options controller.Provi
 	pathPattern, exists := options.StorageClass.Parameters["pathPattern"]
 	if exists {
 		customPath := metadata.stringParser(pathPattern)
+		if customPath != "" {
 			path = filepath.Join(p.path, customPath)
 			fullPath = filepath.Join(mountPath, customPath)
 		}
+	}
 
 	glog.V(4).Infof("creating path %s", fullPath)
 	if err := os.MkdirAll(fullPath, 0777); err != nil {

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.0
+          image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.2
           volumeMounts:
             - name: nfs-client-root
               mountPath: /persistentvolumes

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.0
+          image: gcr.io/k8s-staging-sig-storage/nfs-subdir-external-provisioner:v4.0.2
           volumeMounts:
             - name: nfs-client-root
               mountPath: /persistentvolumes