From aea8ecafbac963c1be050831c5b05200942bdbf5 Mon Sep 17 00:00:00 2001 From: Yonatan Kahana Date: Sat, 16 Jan 2021 14:41:38 +0200 Subject: [PATCH 1/7] Update the README and deploy objects with better class names as examples Signed-off-by: Yonatan Kahana --- README.md | 16 ++++++++-------- deploy/class.yaml | 2 +- deploy/deployment-arm.yaml | 2 +- deploy/deployment.yaml | 2 +- deploy/objects/class.yaml | 2 +- deploy/objects/deployment-arm.yaml | 2 +- deploy/objects/deployment.yaml | 2 +- deploy/test-claim.yaml | 2 -- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index db570747..6b1008bd 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: fuseim.pri/ifs + value: nfs-subdir-external-provisioner - name: NFS_SERVER value: - name: NFS_PATH @@ -119,7 +119,7 @@ spec: path: /var/nfs ``` -You may also want to change the PROVISIONER_NAME above from `fuseim.pri/ifs` to something more descriptive like `nfs-storage`, but if you do remember to also change the PROVISIONER_NAME in the storage class definition below. +You may also want to change the PROVISIONER_NAME above from `nfs-subdir-external-provisioner` to something more descriptive like `nfs-storage`, but if you do remember to also change the PROVISIONER_NAME in the storage class definition below. To disable leader election, define an env variable named ENABLE_LEADER_ELECTION and set its value to false. @@ -129,8 +129,8 @@ To disable leader election, define an env variable named ENABLE_LEADER_ELECTION | Name | Description | Default | | --------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------: | -| onDelete | If it exists and has a delete value, delete the directory, if it exists and has a retain value, save the directory. | will be archived with name on the share: `archived-+volume.Name` | -| archiveOnDelete | If it exists and has a false value, delete the directory. if `onDelete` exists, `archiveOnDelete` will be ignored. | will be archived with name on the share: `archived-+volume.Name` | +| onDelete | If it exists and has a delete value, delete the directory, if it exists and has a retain value, save the directory. | will be archived with name on the share: `archived-` | +| archiveOnDelete | If it exists and has a false value, delete the directory. if `onDelete` exists, `archiveOnDelete` will be ignored. | will be archived with name on the share: `archived-` | | pathPattern | Specifies a template for creating a directory path via PVC metadata's such as labels, annotations, name or namespace. To specify metadata use `${.PVC.}`: `${PVC.namespace}` | n/a | This is `deploy/class.yaml` which defines the NFS-Client's Kubernetes Storage Class: @@ -140,7 +140,7 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: managed-nfs-storage -provisioner: fuseim.pri/ifs # or choose another name, must match deployment's env PROVISIONER_NAME' +provisioner: nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' parameters: pathPattern: "${.PVC.namespace}/${.PVC.annotations.nfs.io/storage-path}" # waits for nfs.io/storage-path annotation, if not specified will accept as empty string. onDelete: delete @@ -166,7 +166,7 @@ Now check the folder has been deleted. **Step 7: Deploying your own PersistentVolumeClaims** -To deploy your own PVC, make sure that you have the correct `storage-class` as indicated by your `deploy/class.yaml` file. +To deploy your own PVC, make sure that you have the correct `storageClassName` as indicated by your `deploy/class.yaml` file. For example: @@ -175,10 +175,10 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: test-claim - annotations: - volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" + annotations: nfs.io/storage-path: "test-path" # not required, depending on whether this annotation was shown in the storage class description spec: + storageClassName: managed-nfs-storage accessModes: - ReadWriteMany resources: diff --git a/deploy/class.yaml b/deploy/class.yaml index 4d3b4805..64e7bf1a 100644 --- a/deploy/class.yaml +++ b/deploy/class.yaml @@ -2,6 +2,6 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: managed-nfs-storage -provisioner: fuseim.pri/ifs # or choose another name, must match deployment's env PROVISIONER_NAME' +provisioner: nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' parameters: archiveOnDelete: "false" diff --git a/deploy/deployment-arm.yaml b/deploy/deployment-arm.yaml index 6ee30150..0b6b41d6 100644 --- a/deploy/deployment-arm.yaml +++ b/deploy/deployment-arm.yaml @@ -27,7 +27,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: fuseim.pri/ifs + value: nfs-subdir-external-provisioner - name: NFS_SERVER value: 10.10.10.60 - name: NFS_PATH diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml index 0ec9c4ed..ec4c0d58 100644 --- a/deploy/deployment.yaml +++ b/deploy/deployment.yaml @@ -27,7 +27,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: fuseim.pri/ifs + value: nfs-subdir-external-provisioner - name: NFS_SERVER value: 10.10.10.60 - name: NFS_PATH diff --git a/deploy/objects/class.yaml b/deploy/objects/class.yaml index 4d3b4805..64e7bf1a 100644 --- a/deploy/objects/class.yaml +++ b/deploy/objects/class.yaml @@ -2,6 +2,6 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: managed-nfs-storage -provisioner: fuseim.pri/ifs # or choose another name, must match deployment's env PROVISIONER_NAME' +provisioner: nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' parameters: archiveOnDelete: "false" diff --git a/deploy/objects/deployment-arm.yaml b/deploy/objects/deployment-arm.yaml index 9cced7e5..ccf81fe2 100644 --- a/deploy/objects/deployment-arm.yaml +++ b/deploy/objects/deployment-arm.yaml @@ -20,7 +20,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: fuseim.pri/ifs + value: nfs-subdir-external-provisioner - name: NFS_SERVER value: 10.10.10.60 - name: NFS_PATH diff --git a/deploy/objects/deployment.yaml b/deploy/objects/deployment.yaml index 1b793676..7b860cf1 100644 --- a/deploy/objects/deployment.yaml +++ b/deploy/objects/deployment.yaml @@ -20,7 +20,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: fuseim.pri/ifs + value: nfs-subdir-external-provisioner - name: NFS_SERVER value: 10.10.10.60 - name: NFS_PATH diff --git a/deploy/test-claim.yaml b/deploy/test-claim.yaml index 9669e8f6..72218eb7 100644 --- a/deploy/test-claim.yaml +++ b/deploy/test-claim.yaml @@ -2,8 +2,6 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: test-claim - annotations: - volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" spec: storageClassName: managed-nfs-storage accessModes: From 7483890c52a7b3ee956a4d675f5b7c5c408259b1 Mon Sep 17 00:00:00 2001 From: Yonatan Kahana Date: Sat, 16 Jan 2021 14:42:21 +0200 Subject: [PATCH 2/7] Add all changes from deprecated repository to CHANGELOG Signed-off-by: Yonatan Kahana --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2725559..53ebb155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +# v4.0.0 +- Remove redundant field in the rbac.yaml (https://github.com/kubernetes-retired/external-storage/pull/970) +- Fixing documentation to be correct for both `kubectl` and `oc` (https://github.com/kubernetes-retired/external-storage/pull/969) +- Point nfs-client users to Helm and split up yamls (https://github.com/kubernetes-retired/external-storage/pull/995) +- Use `kubernetes-sigs/sig-storage-lib-external-provisioner` instaed of `incubator/external-storage/lib` (https://github.com/kubernetes-retired/external-storage/pull/1026) +- Fill in rbac.yaml with ServiceAccount manifest (https://github.com/kubernetes-retired/external-storage/pull/1060, https://github.com/kubernetes-retired/external-storage/pull/1179) +- Fix some typos in README (https://github.com/kubernetes-retired/external-storage/pull/1054) +- Make nfs-client ARM deployment consistent with regular deployment (https://github.com/kubernetes-retired/external-storage/pull/1090) +- Update Deployment apiVersion (from `extensions/v1beta1` to `apps/v1`) and added selector field (https://github.com/kubernetes-retired/external-storage/pull/1230/, https://github.com/kubernetes-retired/external-storage/pull/1231/, https://github.com/kubernetes-retired/external-storage/pull/1283/, https://github.com/kubernetes-retired/external-storage/pull/1294/) +- Fix namespace in deployments (https://github.com/kubernetes-retired/external-storage/pull/1087, https://github.com/kubernetes-retired/external-storage/pull/1279) + +# v3.1.0 +- README Clarifications and minor formatting improvements (https://github.com/kubernetes-retired/external-storage/pull/938/) +- Make leader-election configurable: default endpoints object namespace to controller's instead of kube-system (https://github.com/kubernetes-retired/external-storage/pull/957) + +# v3.0.1 +- Fix archiveOnDelete parsing (https://github.com/kubernetes-retired/external-storage/pull/929) + +# v3.0.0 +- Adds archiveOnDelete parameter to provisioner (https://github.com/kubernetes-retired/external-storage/pull/905) +- Change all clusterroles to have endpoints permissions and reduced events permissions, consolidate where possible (https://github.com/kubernetes-retired/external-storage/pull/892) + +# v2.1.2 +- Propagate StorageClass MountOptions to PVs (https://github.com/kubernetes-retired/external-storage/pull/835) +- Skip deletion if the corresponding directory is not found (https://github.com/kubernetes-retired/external-storage/pull/859) + +# v2.1.1 +- Revert "Add namespace extended attributes to directory" (https://github.com/kubernetes-retired/external-storage/pull/816) + +# v2.1.0 +- Change the storage apiVersion from `storage.k8s.io/v1beta1` to `storage.k8s.io/v1` (https://github.com/kubernetes-retired/external-storage/pull/599) +- Fix Makefile to build on OSX (https://github.com/kubernetes-retired/external-storage/pull/661) +- Change the RBAC apiVersion from `rbac.authorization.k8s.io/v1alpha1` to `rbac.authorization.k8s.io/v1` (https://github.com/kubernetes-retired/external-storage/pull/656) +- Add serviceAccount to deployment (https://github.com/kubernetes-retired/external-storage/pull/653) +- README Improvements (https://github.com/kubernetes-retired/external-storage/pull/687) +- Add namespace extended attributes to directory (https://github.com/kubernetes-retired/external-storage/pull/672) + # v2.0.1 - Add support for ARM (Raspberry PI). Image at `quay.io/external_storage/nfs-client-provisioner-arm`. (https://github.com/kubernetes-incubator/external-storage/pull/275) From 30b0f525986ecc1eff3db00453fdcdfd8d662d5e Mon Sep 17 00:00:00 2001 From: Yonatan Kahana Date: Sat, 16 Jan 2021 15:02:27 +0200 Subject: [PATCH 3/7] Add all changes from current repository to CHANGELOG Signed-off-by: Yonatan Kahana --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53ebb155..22ffcf82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ - Make nfs-client ARM deployment consistent with regular deployment (https://github.com/kubernetes-retired/external-storage/pull/1090) - Update Deployment apiVersion (from `extensions/v1beta1` to `apps/v1`) and added selector field (https://github.com/kubernetes-retired/external-storage/pull/1230/, https://github.com/kubernetes-retired/external-storage/pull/1231/, https://github.com/kubernetes-retired/external-storage/pull/1283/, https://github.com/kubernetes-retired/external-storage/pull/1294/) - Fix namespace in deployments (https://github.com/kubernetes-retired/external-storage/pull/1087, https://github.com/kubernetes-retired/external-storage/pull/1279) +- Update path creation and implemented possibility save data after removing PV (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/7/) +- Support for running controller outside of cluster (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/9) +- Add a flag to disable leader election (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/22) +- Switched to kubernetes `v1.18.0` to be compatible with `>=1.20` selfLink removal (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/26/) +- Enable mountOptions from StorageClass to PersistentVolume (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/28) # v3.1.0 - README Clarifications and minor formatting improvements (https://github.com/kubernetes-retired/external-storage/pull/938/) From 8dd86a700bdaac2378e94626546ff0d2751200f9 Mon Sep 17 00:00:00 2001 From: Yonatan Kahana Date: Sat, 16 Jan 2021 15:10:11 +0200 Subject: [PATCH 4/7] Small fixes of previous commits Signed-off-by: Yonatan Kahana --- CHANGELOG.md | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22ffcf82..0e134dce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ # v4.0.0 - Remove redundant field in the rbac.yaml (https://github.com/kubernetes-retired/external-storage/pull/970) - Fixing documentation to be correct for both `kubectl` and `oc` (https://github.com/kubernetes-retired/external-storage/pull/969) -- Point nfs-client users to Helm and split up yamls (https://github.com/kubernetes-retired/external-storage/pull/995) +- Point users to Helm and split up yamls (https://github.com/kubernetes-retired/external-storage/pull/995) - Use `kubernetes-sigs/sig-storage-lib-external-provisioner` instaed of `incubator/external-storage/lib` (https://github.com/kubernetes-retired/external-storage/pull/1026) - Fill in rbac.yaml with ServiceAccount manifest (https://github.com/kubernetes-retired/external-storage/pull/1060, https://github.com/kubernetes-retired/external-storage/pull/1179) - Fix some typos in README (https://github.com/kubernetes-retired/external-storage/pull/1054) -- Make nfs-client ARM deployment consistent with regular deployment (https://github.com/kubernetes-retired/external-storage/pull/1090) +- Make ARM deployment consistent with regular deployment (https://github.com/kubernetes-retired/external-storage/pull/1090) - Update Deployment apiVersion (from `extensions/v1beta1` to `apps/v1`) and added selector field (https://github.com/kubernetes-retired/external-storage/pull/1230/, https://github.com/kubernetes-retired/external-storage/pull/1231/, https://github.com/kubernetes-retired/external-storage/pull/1283/, https://github.com/kubernetes-retired/external-storage/pull/1294/) - Fix namespace in deployments (https://github.com/kubernetes-retired/external-storage/pull/1087, https://github.com/kubernetes-retired/external-storage/pull/1279) - Update path creation and implemented possibility save data after removing PV (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/7/) diff --git a/README.md b/README.md index 6b1008bd..8aa33051 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: test-claim - annotations: + annotations: nfs.io/storage-path: "test-path" # not required, depending on whether this annotation was shown in the storage class description spec: storageClassName: managed-nfs-storage From 56edbc016ba03bb43c3187663c620660084d0913 Mon Sep 17 00:00:00 2001 From: Yonatan Kahana Date: Mon, 18 Jan 2021 18:16:24 +0200 Subject: [PATCH 5/7] Remove changes that not affect the provisioner from the changelog Signed-off-by: Yonatan Kahana --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e134dce..49e60fad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,7 @@ # v4.0.0 - Remove redundant field in the rbac.yaml (https://github.com/kubernetes-retired/external-storage/pull/970) -- Fixing documentation to be correct for both `kubectl` and `oc` (https://github.com/kubernetes-retired/external-storage/pull/969) -- Point users to Helm and split up yamls (https://github.com/kubernetes-retired/external-storage/pull/995) - Use `kubernetes-sigs/sig-storage-lib-external-provisioner` instaed of `incubator/external-storage/lib` (https://github.com/kubernetes-retired/external-storage/pull/1026) - Fill in rbac.yaml with ServiceAccount manifest (https://github.com/kubernetes-retired/external-storage/pull/1060, https://github.com/kubernetes-retired/external-storage/pull/1179) -- Fix some typos in README (https://github.com/kubernetes-retired/external-storage/pull/1054) - Make ARM deployment consistent with regular deployment (https://github.com/kubernetes-retired/external-storage/pull/1090) - Update Deployment apiVersion (from `extensions/v1beta1` to `apps/v1`) and added selector field (https://github.com/kubernetes-retired/external-storage/pull/1230/, https://github.com/kubernetes-retired/external-storage/pull/1231/, https://github.com/kubernetes-retired/external-storage/pull/1283/, https://github.com/kubernetes-retired/external-storage/pull/1294/) - Fix namespace in deployments (https://github.com/kubernetes-retired/external-storage/pull/1087, https://github.com/kubernetes-retired/external-storage/pull/1279) @@ -15,7 +12,6 @@ - Enable mountOptions from StorageClass to PersistentVolume (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner/pull/28) # v3.1.0 -- README Clarifications and minor formatting improvements (https://github.com/kubernetes-retired/external-storage/pull/938/) - Make leader-election configurable: default endpoints object namespace to controller's instead of kube-system (https://github.com/kubernetes-retired/external-storage/pull/957) # v3.0.1 @@ -37,7 +33,6 @@ - Fix Makefile to build on OSX (https://github.com/kubernetes-retired/external-storage/pull/661) - Change the RBAC apiVersion from `rbac.authorization.k8s.io/v1alpha1` to `rbac.authorization.k8s.io/v1` (https://github.com/kubernetes-retired/external-storage/pull/656) - Add serviceAccount to deployment (https://github.com/kubernetes-retired/external-storage/pull/653) -- README Improvements (https://github.com/kubernetes-retired/external-storage/pull/687) - Add namespace extended attributes to directory (https://github.com/kubernetes-retired/external-storage/pull/672) # v2.0.1 From d9f68cefe9aca936030063a24fa0421dc4eebd27 Mon Sep 17 00:00:00 2001 From: Yonatan Kahana Date: Thu, 4 Feb 2021 17:55:08 +0200 Subject: [PATCH 6/7] Fix typo in CHANGELOG and change provisioner name to use the sigs namespace Signed-off-by: Yonatan Kahana --- CHANGELOG.md | 2 +- README.md | 6 +++--- deploy/class.yaml | 2 +- deploy/deployment-arm.yaml | 2 +- deploy/deployment.yaml | 2 +- deploy/objects/class.yaml | 2 +- deploy/objects/deployment-arm.yaml | 2 +- deploy/objects/deployment.yaml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49e60fad..141e5c4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # 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` instaed of `incubator/external-storage/lib` (https://github.com/kubernetes-retired/external-storage/pull/1026) +- Use `kubernetes-sigs/sig-storage-lib-external-provisioner` instead of `incubator/external-storage/lib` (https://github.com/kubernetes-retired/external-storage/pull/1026) - Fill in rbac.yaml with ServiceAccount manifest (https://github.com/kubernetes-retired/external-storage/pull/1060, https://github.com/kubernetes-retired/external-storage/pull/1179) - Make ARM deployment consistent with regular deployment (https://github.com/kubernetes-retired/external-storage/pull/1090) - Update Deployment apiVersion (from `extensions/v1beta1` to `apps/v1`) and added selector field (https://github.com/kubernetes-retired/external-storage/pull/1230/, https://github.com/kubernetes-retired/external-storage/pull/1231/, https://github.com/kubernetes-retired/external-storage/pull/1283/, https://github.com/kubernetes-retired/external-storage/pull/1294/) diff --git a/README.md b/README.md index 8aa33051..3a0104f3 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: nfs-subdir-external-provisioner + value: k8s-sigs.io/nfs-subdir-external-provisioner - name: NFS_SERVER value: - name: NFS_PATH @@ -119,7 +119,7 @@ spec: path: /var/nfs ``` -You may also want to change the PROVISIONER_NAME above from `nfs-subdir-external-provisioner` to something more descriptive like `nfs-storage`, but if you do remember to also change the PROVISIONER_NAME in the storage class definition below. +You may also want to change the PROVISIONER_NAME above from `k8s-sigs.io/nfs-subdir-external-provisioner` to something more descriptive like `nfs-storage`, but if you do remember to also change the PROVISIONER_NAME in the storage class definition below. To disable leader election, define an env variable named ENABLE_LEADER_ELECTION and set its value to false. @@ -140,7 +140,7 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: managed-nfs-storage -provisioner: nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' +provisioner: k8s-sigs.io/nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' parameters: pathPattern: "${.PVC.namespace}/${.PVC.annotations.nfs.io/storage-path}" # waits for nfs.io/storage-path annotation, if not specified will accept as empty string. onDelete: delete diff --git a/deploy/class.yaml b/deploy/class.yaml index 64e7bf1a..d26ffb3b 100644 --- a/deploy/class.yaml +++ b/deploy/class.yaml @@ -2,6 +2,6 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: managed-nfs-storage -provisioner: nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' +provisioner: k8s-sigs.io/nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' parameters: archiveOnDelete: "false" diff --git a/deploy/deployment-arm.yaml b/deploy/deployment-arm.yaml index 0b6b41d6..0b3f0bce 100644 --- a/deploy/deployment-arm.yaml +++ b/deploy/deployment-arm.yaml @@ -27,7 +27,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: nfs-subdir-external-provisioner + value: k8s-sigs.io/nfs-subdir-external-provisioner - name: NFS_SERVER value: 10.10.10.60 - name: NFS_PATH diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml index ec4c0d58..d37f43aa 100644 --- a/deploy/deployment.yaml +++ b/deploy/deployment.yaml @@ -27,7 +27,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: nfs-subdir-external-provisioner + value: k8s-sigs.io/nfs-subdir-external-provisioner - name: NFS_SERVER value: 10.10.10.60 - name: NFS_PATH diff --git a/deploy/objects/class.yaml b/deploy/objects/class.yaml index 64e7bf1a..d26ffb3b 100644 --- a/deploy/objects/class.yaml +++ b/deploy/objects/class.yaml @@ -2,6 +2,6 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: managed-nfs-storage -provisioner: nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' +provisioner: k8s-sigs.io/nfs-subdir-external-provisioner # or choose another name, must match deployment's env PROVISIONER_NAME' parameters: archiveOnDelete: "false" diff --git a/deploy/objects/deployment-arm.yaml b/deploy/objects/deployment-arm.yaml index ccf81fe2..d12f203b 100644 --- a/deploy/objects/deployment-arm.yaml +++ b/deploy/objects/deployment-arm.yaml @@ -20,7 +20,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: nfs-subdir-external-provisioner + value: k8s-sigs.io/nfs-subdir-external-provisioner - name: NFS_SERVER value: 10.10.10.60 - name: NFS_PATH diff --git a/deploy/objects/deployment.yaml b/deploy/objects/deployment.yaml index 7b860cf1..8b153a19 100644 --- a/deploy/objects/deployment.yaml +++ b/deploy/objects/deployment.yaml @@ -20,7 +20,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: nfs-subdir-external-provisioner + value: k8s-sigs.io/nfs-subdir-external-provisioner - name: NFS_SERVER value: 10.10.10.60 - name: NFS_PATH From f2e15da1e9f820c74e60b1017b64261f344e2e29 Mon Sep 17 00:00:00 2001 From: Yonatan Kahana Date: Thu, 4 Feb 2021 20:55:23 +0200 Subject: [PATCH 7/7] Change the topic of unrleased changes to Unreleased Signed-off-by: Yonatan Kahana --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 141e5c4a..0c080cef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# v4.0.0 +# Unreleased - 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) - Fill in rbac.yaml with ServiceAccount manifest (https://github.com/kubernetes-retired/external-storage/pull/1060, https://github.com/kubernetes-retired/external-storage/pull/1179)