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 · 2021-04-14 15:01:34 +03:00 · 2021-04-01 22:16:11 -07:00 · 2021-03-31 21:23:20 +08:00
7 changed files with 10 additions and 8 deletions
--- a/README.md
+++ b/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.2
+          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
@@ -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.7
+version: 4.0.8
 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
@@ -52,7 +52,7 @@ The following tables lists the configurable parameters of this chart and their d
 | ----------------------------------- | ----------------------------------------------------------- | ------------------------------------------------- |
 | `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.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`                                    |
 | `storageClass.name`                 | Name of the storageClass                                    | `nfs-client`                                      |
--- a/charts/nfs-subdir-external-provisioner/values.yaml
+++ b/charts/nfs-subdir-external-provisioner/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 strategyType: Recreate

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

--- 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.2
+          image: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
          volumeMounts:
            - name: nfs-client-root
              mountPath: /persistentvolumes
--- 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.2
+          image: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
          volumeMounts:
            - name: nfs-client-root
              mountPath: /persistentvolumes
Author	SHA1	Message	Date
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
Kubernetes Prow Robot	eae7143d98	Merge pull request #83 from MiaoZhou/fixEmptyCustomPath prevent mounting of root directory	2021-04-01 22:16: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