Merge pull request #2 from Madhan-SWE/feature_remove_pvm_instance_id_v2

Remove PVM Instance Id from deployment file

Author: mkumatag

block/pod.yaml

@@ -14,4 +14,4 @@ spec:
   volumes:
     - name: data
       persistentVolumeClaim:
-        claimName: block-claim
+        claimName: block-claim

block/pvc.yaml

@@ -9,4 +9,4 @@ spec:
   storageClassName: powervs-sc
   resources:
     requests:
-      storage: 10Gi
+      storage: 10Gi

cmd/main.go

@@ -38,7 +38,6 @@ func main() {
 		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,14 +28,11 @@ 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)")
+	fs.BoolVar(&s.Debug, "debug", false, "Debug option PowerVS client(Prints API requests and replies)")
 }

deploy/kubernetes/base/clusterrole-node.yaml

@@ -0,0 +1,11 @@
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: powervs-node-role
+  labels:
+    app.kubernetes.io/name: powervs-csi-driver
+rules:
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get"]

deploy/kubernetes/base/clusterrolebinding-node.yaml

@@ -0,0 +1,15 @@
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: powervs-csi-node-getter-binding
+  labels:
+    app.kubernetes.io/name: powervs-csi-driver
+subjects:
+  - kind: ServiceAccount
+    name: powervs-csi-node-sa
+    namespace: kube-system
+roleRef:
+  kind: ClusterRole
+  name: powervs-node-role
+  apiGroup: rbac.authorization.k8s.io 

deploy/kubernetes/base/controller.yaml

@@ -33,11 +33,14 @@ spec:
             - --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
+            - name: CSI_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
             - name: IBMCLOUD_API_KEY
               valueFrom:
                 secretKeyRef:

deploy/kubernetes/base/node.yaml

@@ -20,6 +20,7 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
       hostNetwork: true
+      serviceAccountName: powervs-csi-node-sa
       priorityClassName: system-node-critical
       tolerations:
         - operator: Exists
@@ -35,11 +36,14 @@ spec:
           # - --volume-attach-limit=42
             - --logtostderr
             - --v=5
-            - --pvm-cloud-instance-id=7845d372-d4e1-46b8-91fc-41051c984601
             - --debug
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
+            - name: CSI_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
             - name: IBMCLOUD_API_KEY
               valueFrom:
                 secretKeyRef:

deploy/kubernetes/base/serviceaccount-csi-node.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: powervs-csi-node-sa
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/name: powervs-csi-driver

go.mod

@@ -10,7 +10,9 @@ require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	google.golang.org/grpc v1.27.0
+	k8s.io/api v0.19.4
 	k8s.io/apimachinery v0.19.4
+	k8s.io/client-go v0.19.4
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/kubernetes v1.19.4
 	k8s.io/utils v0.0.0-20200729134348-d5654de09c73