From 2d36f5333ed645fa7e6de56fd3269197609c19fe Mon Sep 17 00:00:00 2001 From: Jan Wozniak Date: Sun, 15 Mar 2020 13:01:35 +0100 Subject: [PATCH] Rename driver to follow CSI plugin naming conventions --- deploy/kubernetes/csi-nfs-driverinfo.yaml | 2 +- examples/kubernetes/nginx.yaml | 2 +- pkg/nfs/nfs.go | 2 +- test/nfs-testdriver.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/kubernetes/csi-nfs-driverinfo.yaml b/deploy/kubernetes/csi-nfs-driverinfo.yaml index ac5cf0ce..7b7c0e5b 100644 --- a/deploy/kubernetes/csi-nfs-driverinfo.yaml +++ b/deploy/kubernetes/csi-nfs-driverinfo.yaml @@ -1,7 +1,7 @@ apiVersion: storage.k8s.io/v1beta1 kind: CSIDriver metadata: - name: csi-nfsplugin + name: nfs.csi.k8s.io spec: attachRequired: false volumeLifecycleModes: diff --git a/examples/kubernetes/nginx.yaml b/examples/kubernetes/nginx.yaml index 8048e9cd..2fd0c1aa 100644 --- a/examples/kubernetes/nginx.yaml +++ b/examples/kubernetes/nginx.yaml @@ -10,7 +10,7 @@ spec: capacity: storage: 100Gi csi: - driver: csi-nfsplugin + driver: nfs.csi.k8s.io volumeHandle: data-id volumeAttributes: server: 127.0.0.1 diff --git a/pkg/nfs/nfs.go b/pkg/nfs/nfs.go index 1ad30312..2459882e 100644 --- a/pkg/nfs/nfs.go +++ b/pkg/nfs/nfs.go @@ -36,7 +36,7 @@ type nfsDriver struct { } const ( - driverName = "csi-nfsplugin" + driverName = "nfs.csi.k8s.io" ) var ( diff --git a/test/nfs-testdriver.go b/test/nfs-testdriver.go index 290f54c6..22a7d6ae 100644 --- a/test/nfs-testdriver.go +++ b/test/nfs-testdriver.go @@ -54,7 +54,7 @@ func initNFSDriver(name string, manifests ...string) testsuites.TestDriver { func InitNFSDriver() testsuites.TestDriver { - return initNFSDriver("csi-nfsplugin", + return initNFSDriver("nfs.csi.k8s.io", "csi-attacher-nfsplugin.yaml", "csi-attacher-rbac.yaml", "csi-nodeplugin-nfsplugin.yaml",