Remove provisioner flag, update README

Signed-off-by: Jose A. Rivera <[email protected]>

README.md

@@ -29,7 +29,7 @@ bin/hostpathplugin --drivername mydriver  --endpoint unix://tmp/csi.sock --nodei
 ### Start external provisioner
 
 ```bash
-bin/csi-provisioner -kubeconfig /var/run/kubernetes/admin.kubeconfig -alsologtostderr -provisioner csi-flex
+bin/csi-provisioner --kubeconfig /var/run/kubernetes/admin.kubeconfig --alsologtostderr
 ```
 
 ### Create Storage class, PVC, and Pod

cmd/csi-provisioner/csi-provisioner.go

@@ -45,7 +45,6 @@ import (
 )
 
 var (
-	provisioner          = flag.String("provisioner", "", "Name of the provisioner. The provisioner will only provision volumes for claims that request a StorageClass with a provisioner field set equal to this name. If omitted, CSI driver name is used.")
 	master               = flag.String("master", "", "Master URL to build a client config from. Either this or kubeconfig needs to be set if the provisioner is being run out of cluster.")
 	kubeconfig           = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Either this or master needs to be set if the provisioner is being run out of cluster.")
 	csiEndpoint          = flag.String("csi-address", "/run/csi/socket", "The gRPC endpoint for Target CSI Volume.")
@@ -120,10 +119,6 @@ func init() {
 		glog.Fatalf("Error getting server version: %v", err)
 	}
 
-	// Generate a unique ID for this provisioner
-	timeStamp := time.Now().UnixNano() / int64(time.Millisecond)
-	identity := strconv.FormatInt(timeStamp, 10) + "-" + strconv.Itoa(rand.Intn(10000)) + "-" + *provisioner
-
 	// Provisioner will stay in Init until driver opens csi socket, once it's done
 	// controller will exit this loop and proceed normally.
 	socketDown := true
@@ -137,21 +132,23 @@ func init() {
 		time.Sleep(10 * time.Second)
 	}
 
-	// Autodetect provisioner name if necessary
-	if *provisioner == "" {
-		*provisioner, err = ctrl.GetDriverName(grpcClient, *connectionTimeout)
-		if err != nil {
-			glog.Fatalf("Error getting CSI driver name: %s", err)
-		}
-		glog.V(2).Infof("Detected CSI driver %q", *provisioner)
+	// Autodetect provisioner name
+	provisionerName, err := ctrl.GetDriverName(grpcClient, *connectionTimeout)
+	if err != nil {
+		glog.Fatalf("Error getting CSI driver name: %s", err)
 	}
+	glog.V(2).Infof("Detected CSI driver %s", provisionerName)
+
+	// Generate a unique ID for this provisioner
+	timeStamp := time.Now().UnixNano() / int64(time.Millisecond)
+	identity := strconv.FormatInt(timeStamp, 10) + "-" + strconv.Itoa(rand.Intn(10000)) + "-" + provisionerName
 
 	// Create the provisioner: it implements the Provisioner interface expected by
 	// the controller
 	csiProvisioner := ctrl.NewCSIProvisioner(clientset, csiAPIClient, *csiEndpoint, *connectionTimeout, identity, *volumeNamePrefix, *volumeNameUUIDLength, grpcClient, snapClient)
 	provisionController = controller.NewProvisionController(
 		clientset,
-		*provisioner,
+		provisionerName,
 		csiProvisioner,
 		serverVersion.GitVersion,
 		controller.LeaderElection(*enableLeaderElection),