Merge pull request #258 from gman0/manila-csicephfs-update

Manila: update csi-cephfs backend to 0.3.0
kubernetes · Aug 14, 2018 · f0e9645 · f0e9645
2 parents 1ebda09 + ba197d3
commit f0e9645
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 21 deletions.
diff --git a/examples/manila-provisioner/cephfs/user-deploy/pod.yaml b/examples/manila-provisioner/cephfs/user-deploy/pod.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: manila-cephfs-pod
+spec:
+  containers:
+    - name: test
+      image: busybox
+      command: [ "/bin/sh", "-c", "trap : TERM INT; (while true; do sleep 1000; done) & wait" ]
+      volumeMounts:
+        - name: cephfs-share
+          mountPath: /mnt
+  volumes:
+    - name: cephfs-share
+      persistentVolumeClaim:
+        claimName: manila-cephfs-pvc
+        readOnly: false
diff --git a/examples/manila-provisioner/csi-cephfs/daemonsets.yaml b/examples/manila-provisioner/csi-cephfs/daemonsets.yaml
@@ -15,7 +15,7 @@ spec:
       hostNetwork: true
       containers:
         - name: driver-registrar
-          image: quay.io/k8scsi/driver-registrar:v0.2.0
+          image: quay.io/k8scsi/driver-registrar:v0.3.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -35,7 +35,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: quay.io/cephcsi/cephfsplugin:v0.2.0
+          image: quay.io/cephcsi/cephfsplugin:v0.3.0
           args :
             - "--nodeid=$(NODE_ID)"
             - "--endpoint=$(CSI_ENDPOINT)"

diff --git a/examples/manila-provisioner/csi-cephfs/services.yaml b/examples/manila-provisioner/csi-cephfs/services.yaml
@@ -23,16 +23,4 @@ spec:
   ports:
     - name: dummy
       port: 12345
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: manila-provisioner
-  labels:
-    app: manila-provisioner
-spec:
-  selector:
-    app: manila-provisioner
-  ports:
-    - name: dummy
-      port: 12345
+
diff --git a/examples/manila-provisioner/csi-cephfs/statefulsets.yaml b/examples/manila-provisioner/csi-cephfs/statefulsets.yaml
@@ -13,7 +13,7 @@ spec:
       serviceAccount: csi-attacher
       containers:
         - name: csi-cephfsplugin-attacher
-          image: quay.io/k8scsi/csi-attacher:v0.2.0
+          image: quay.io/k8scsi/csi-attacher:v0.3.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -49,7 +49,7 @@ spec:
       serviceAccount: csi-provisioner
       containers:
         - name: csi-cephfsplugin-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v0.2.0
+          image: quay.io/k8scsi/csi-provisioner:v0.3.0
           args:
             - "--provisioner=csi-cephfsplugin"
             - "--csi-address=$(ADDRESS)"

diff --git a/pkg/share/manila/provisioner.go b/pkg/share/manila/provisioner.go
@@ -132,7 +132,7 @@ func (p *Provisioner) Provision(volOptions controller.VolumeOptions) (*v1.Persis
 		return nil, fmt.Errorf("backend %s failed to create volume source for share %s: %v", shareBackend.Name(), share.ID, err)
 	}
 
-	glog.Infof("share %s (%s/%s) provisioned successfully", share.ID, shareOptions.Protocol, shareOptions.Backend)
+	glog.Infof("successfully provisioned share %s (%s/%s)", share.ID, shareOptions.Protocol, shareOptions.Backend)
 
 	return buildPersistentVolume(share, accessRight, volSource, &volOptions, shareOptions), nil
 }
@@ -177,7 +177,7 @@ func (p *Provisioner) Delete(pv *v1.PersistentVolume) error {
 		return fmt.Errorf("failed to delete share %s: %v", shareID, err)
 	}
 
-	glog.Infof("share %s deleted successfully", shareID)
+	glog.Infof("successfully deleted share %s", shareID)
 
 	return nil
 }
diff --git a/pkg/share/manila/sharebackends/csicephfs.go b/pkg/share/manila/sharebackends/csicephfs.go
@@ -47,7 +47,7 @@ func (CSICephFS) BuildSource(args *BuildSourceArgs) (*v1.PersistentVolumeSource,
 				"mounter":         "fuse",
 				"provisionVolume": "false",
 			},
-			NodePublishSecretRef: &args.Options.ShareSecretRef,
+			NodeStageSecretRef: &args.Options.ShareSecretRef,
 		},
 	}, nil
 }

diff --git a/pkg/share/manila/sharebackends/sharebackend_test.go b/pkg/share/manila/sharebackends/sharebackend_test.go
@@ -90,7 +90,7 @@ func TestCSICephFSBuildSource(t *testing.T) {
 				"mounter":         "fuse",
 				"provisionVolume": "false",
 			},
-			NodePublishSecretRef: &v1.SecretReference{
+			NodeStageSecretRef: &v1.SecretReference{
 				Name:      "manila-011d21e2-fbc3-4e4a-9993-9ea223f73264",
 				Namespace: "default",
 			},