block device support

Author: mkumatag

block/pod.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: app
+spec:
+  containers:
+    - name: app
+      image: busybox
+      command: ["/bin/sh", "-c"]
+      args: ["tail -f /dev/null"]
+      volumeDevices:
+        - name: data
+          devicePath: /dev/xvda
+  volumes:
+    - name: data
+      persistentVolumeClaim:
+        claimName: block-claim

block/pvc.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: block-claim
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Block
+  storageClassName: powervs-sc
+  resources:
+    requests:
+      storage: 10Gi

block/sc.yaml

@@ -0,0 +1,8 @@
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: powervs-sc
+provisioner: powervs.csi.ibm.com
+volumeBindingMode: WaitForFirstConsumer
+parameters:
+  type: tier3

cmd/main.go

@@ -35,8 +35,10 @@ func main() {
 		driver.WithExtraTags(options.ControllerOptions.ExtraTags),
 		//river.WithExtraVolumeTags(options.ControllerOptions.ExtraVolumeTags),
 		driver.WithMode(options.DriverMode),
+		driver.WithDebug(options.ServerOptions.Debug),
 		driver.WithVolumeAttachLimit(options.NodeOptions.VolumeAttachLimit),
 		driver.WithKubernetesClusterID(options.ControllerOptions.KubernetesClusterID),
+		driver.WithPVMCloudInstanceID(options.ServerOptions.PVMCloudInstanceID),
 	)
 	if err != nil {
 		klog.Fatalln(err)

cmd/options/server_options.go

@@ -28,8 +28,14 @@ import (
 type ServerOptions struct {
 	// Endpoint is the endpoint that the driver server should listen on.
 	Endpoint string
+	// PowerVS Cloud Instance ID
+	PVMCloudInstanceID string
+	// Debug
+	Debug bool
 }
 
 func (s *ServerOptions) AddFlags(fs *flag.FlagSet) {
 	fs.StringVar(&s.Endpoint, "endpoint", driver.DefaultCSIEndpoint, "Endpoint for the CSI driver server")
+	fs.StringVar(&s.PVMCloudInstanceID, "pvm-cloud-instance-id","","ID of the PVM Cloud Instance ID")
+	fs.BoolVar(&s.Debug, "debug",false,"Debug option PowerVS client(Prints API requests and replies)")
 }

deploy/kubernetes/base/clusterrole-attacher.yaml

@@ -1,9 +1,8 @@
 ---
-# Source: powervs-csi-driver/templates/clusterrole-attacher.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ebs-external-attacher-role
+  name: powervs-external-attacher-role
   labels:
     app.kubernetes.io/name: powervs-csi-driver
 rules:

deploy/kubernetes/base/clusterrole-provisioner.yaml

@@ -1,9 +1,8 @@
 ---
-# Source: powervs-csi-driver/templates/clusterrole-provisioner.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ebs-external-provisioner-role
+  name: powervs-external-provisioner-role
   labels:
     app.kubernetes.io/name: powervs-csi-driver
 rules:

deploy/kubernetes/base/clusterrolebinding-attacher.yaml

@@ -1,16 +1,15 @@
 ---
-# Source: powervs-csi-driver/templates/clusterrolebinding-attacher.yaml
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ebs-csi-attacher-binding
+  name: powervs-csi-attacher-binding
   labels:
     app.kubernetes.io/name: powervs-csi-driver
 subjects:
   - kind: ServiceAccount
-    name: ebs-csi-controller-sa
+    name: powervs-csi-controller-sa
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: ebs-external-attacher-role
+  name: powervs-external-attacher-role
   apiGroup: rbac.authorization.k8s.io

deploy/kubernetes/base/clusterrolebinding-provisioner.yaml

@@ -1,16 +1,15 @@
 ---
-# Source: powervs-csi-driver/templates/clusterrolebinding-provisioner.yaml
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ebs-csi-provisioner-binding
+  name: powervs-csi-provisioner-binding
   labels:
     app.kubernetes.io/name: powervs-csi-driver
 subjects:
   - kind: ServiceAccount
-    name: ebs-csi-controller-sa
+    name: powervs-csi-controller-sa
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: ebs-external-provisioner-role
+  name: powervs-external-provisioner-role
   apiGroup: rbac.authorization.k8s.io

deploy/kubernetes/base/controller.yaml

@@ -1,40 +1,40 @@
 ---
-# Source: powervs-csi-driver/templates/controller.yaml
-# Controller Service
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: ebs-csi-controller
+  name: powervs-csi-controller
   namespace: kube-system
   labels:
     app.kubernetes.io/name: powervs-csi-driver
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app: ebs-csi-controller
+      app: powervs-csi-controller
       app.kubernetes.io/name: powervs-csi-driver
   template:
     metadata:
       labels:
-        app: ebs-csi-controller
+        app: powervs-csi-controller
         app.kubernetes.io/name: powervs-csi-driver
     spec:
       nodeSelector:
         kubernetes.io/os: linux
-      serviceAccountName: ebs-csi-controller-sa
+      serviceAccountName: powervs-csi-controller-sa
       priorityClassName: system-cluster-critical
       tolerations:
         - operator: Exists
       containers:
-        - name: ebs-plugin
+        - name: powervs-plugin
           image: quay.io/powercloud/powervs-csi-driver:v0.0.1
           imagePullPolicy: Always
           args:
             # - {all,controller,node} # specify the driver mode
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
             - --v=5
+            - --pvm-cloud-instance-id=7845d372-d4e1-46b8-91fc-41051c984601
+            - --debug
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock