From 4dc9f66be32fb812962274c1e46ba0df5003d1fe Mon Sep 17 00:00:00 2001
From: Jan Wozniak <wozniak.jan@gmail.com>
Date: Fri, 28 Feb 2020 15:08:25 +0100
Subject: [PATCH 1/3] Fix deprecated API group for StatefulSet

---
 deploy/kubernetes/csi-attacher-nfsplugin.yaml   | 5 ++++-
 deploy/kubernetes/csi-nodeplugin-nfsplugin.yaml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/deploy/kubernetes/csi-attacher-nfsplugin.yaml b/deploy/kubernetes/csi-attacher-nfsplugin.yaml
index cb390e21..d94c861c 100644
--- a/deploy/kubernetes/csi-attacher-nfsplugin.yaml
+++ b/deploy/kubernetes/csi-attacher-nfsplugin.yaml
@@ -16,12 +16,15 @@ spec:
 
 ---
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: csi-attacher-nfsplugin
 spec:
   serviceName: "csi-attacher"
   replicas: 1
+  selector: 
+    matchLabels:
+      app: csi-attacher-nfsplugin
   template:
     metadata:
       labels:
diff --git a/deploy/kubernetes/csi-nodeplugin-nfsplugin.yaml b/deploy/kubernetes/csi-nodeplugin-nfsplugin.yaml
index c259cd1f..7c53507e 100644
--- a/deploy/kubernetes/csi-nodeplugin-nfsplugin.yaml
+++ b/deploy/kubernetes/csi-nodeplugin-nfsplugin.yaml
@@ -1,7 +1,7 @@
 # This YAML file contains driver-registrar & csi driver nodeplugin API objects
 # that are necessary to run CSI nodeplugin for nfs
 kind: DaemonSet
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 metadata:
   name: csi-nodeplugin-nfsplugin
 spec:

From 50d5f44d9c49bb118fc5a784d1f880fdddae02a4 Mon Sep 17 00:00:00 2001
From: Jan Wozniak <wozniak.jan@gmail.com>
Date: Thu, 5 Mar 2020 16:47:34 +0100
Subject: [PATCH 2/3] Remove csi-attacher

---
 deploy/kubernetes/csi-attacher-nfsplugin.yaml | 66 -------------------
 deploy/kubernetes/csi-attacher-rbac.yaml      | 37 -----------
 deploy/kubernetes/csi-nfs-driverinfo.yaml     |  9 +++
 3 files changed, 9 insertions(+), 103 deletions(-)
 delete mode 100644 deploy/kubernetes/csi-attacher-nfsplugin.yaml
 delete mode 100644 deploy/kubernetes/csi-attacher-rbac.yaml
 create mode 100644 deploy/kubernetes/csi-nfs-driverinfo.yaml

diff --git a/deploy/kubernetes/csi-attacher-nfsplugin.yaml b/deploy/kubernetes/csi-attacher-nfsplugin.yaml
deleted file mode 100644
index d94c861c..00000000
--- a/deploy/kubernetes/csi-attacher-nfsplugin.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-# This YAML file contains attacher & csi driver API objects that are necessary
-# to run external CSI attacher for nfs
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: csi-attacher-nfsplugin
-  labels:
-    app: csi-attacher-nfsplugin
-spec:
-  selector:
-    app: csi-attacher-nfsplugin
-  ports:
-    - name: dummy
-      port: 12345
-
----
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
-  name: csi-attacher-nfsplugin
-spec:
-  serviceName: "csi-attacher"
-  replicas: 1
-  selector: 
-    matchLabels:
-      app: csi-attacher-nfsplugin
-  template:
-    metadata:
-      labels:
-        app: csi-attacher-nfsplugin
-    spec:
-      serviceAccount: csi-attacher
-      containers:
-        - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.0.1
-          args:
-            - "--v=5"
-            - "--csi-address=$(ADDRESS)"
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
-          imagePullPolicy: "IfNotPresent"
-          volumeMounts:
-            - name: socket-dir
-              mountPath: /csi
-
-        - name: nfs
-          image: quay.io/k8scsi/nfsplugin:v1.0.0
-          args :
-            - "--nodeid=$(NODE_ID)"
-            - "--endpoint=$(CSI_ENDPOINT)"
-          env:
-            - name: NODE_ID
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            - name: CSI_ENDPOINT
-              value: unix://plugin/csi.sock
-          imagePullPolicy: "IfNotPresent"
-          volumeMounts:
-            - name: socket-dir
-              mountPath: /plugin
-      volumes:
-        - name: socket-dir
-          emptyDir:
diff --git a/deploy/kubernetes/csi-attacher-rbac.yaml b/deploy/kubernetes/csi-attacher-rbac.yaml
deleted file mode 100644
index 975fdd67..00000000
--- a/deploy/kubernetes/csi-attacher-rbac.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# This YAML file contains RBAC API objects that are necessary to run external
-# CSI attacher for nfs flex adapter
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: csi-attacher
-
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: external-attacher-runner
-rules:
-  - apiGroups: [""]
-    resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: [""]
-    resources: ["nodes"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["volumeattachments"]
-    verbs: ["get", "list", "watch", "update"]
-
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: csi-attacher-role
-subjects:
-  - kind: ServiceAccount
-    name: csi-attacher
-    namespace: default
-roleRef:
-  kind: ClusterRole
-  name: external-attacher-runner
-  apiGroup: rbac.authorization.k8s.io
diff --git a/deploy/kubernetes/csi-nfs-driverinfo.yaml b/deploy/kubernetes/csi-nfs-driverinfo.yaml
new file mode 100644
index 00000000..ac5cf0ce
--- /dev/null
+++ b/deploy/kubernetes/csi-nfs-driverinfo.yaml
@@ -0,0 +1,9 @@
+apiVersion: storage.k8s.io/v1beta1
+kind: CSIDriver
+metadata:
+  name: csi-nfsplugin
+spec:
+  attachRequired: false
+  volumeLifecycleModes:
+  - Persistent
+  podInfoOnMount: true

From 748602fde97fcb38e282a37de13207ae53998490 Mon Sep 17 00:00:00 2001
From: Jan Wozniak <wozniak.jan@gmail.com>
Date: Fri, 6 Mar 2020 12:41:34 +0100
Subject: [PATCH 3/3] Update driver version

---
 pkg/nfs/nfs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/nfs/nfs.go b/pkg/nfs/nfs.go
index d637b0d2..1ad30312 100644
--- a/pkg/nfs/nfs.go
+++ b/pkg/nfs/nfs.go
@@ -40,7 +40,7 @@ const (
 )
 
 var (
-	version = "1.0.0-rc2"
+	version = "1.0.0"
 )
 
 func NewNFSdriver(nodeID, endpoint string) *nfsDriver {