Added provision/delete retry count options

deploy/chart/templates/deployment.yaml

@@ -51,6 +51,14 @@ spec:
             - --worker-threads
             - {{ .Values.workerThreads }}
           {{- end }}
+          {{- if .Values.provisioningRetryCount }}
+            - --provisioning-retry-count
+            - {{ .Values.provisioningRetryCount }}
+          {{- end }}
+          {{- if .Values.deletionRetryCount }}
+            - --deletion-retry-count
+            - {{ .Values.deletionRetryCount }}
+          {{- end }}
           volumeMounts:
             - name: config-volume
               mountPath: /etc/config/

deploy/chart/values.yaml

@@ -140,4 +140,10 @@ configmap:
         imagePullPolicy: IfNotPresent
 
 # Number of provisioner worker threads to call provision/delete simultaneously.
-workerThreads: 4
+# workerThreads: 4
+
+# Number of retries of failed volume provisioning. 0 means retry indefinitely.
+# provisioningRetryCount: 15
+
+# Number of retries of failed volume deletion. 0 means retry indefinitely.
+# deletionRetryCount: 15

main.go

@@ -40,7 +40,11 @@ var (
 	FlagHelperPodFile             = "helper-pod-file"
 	DefaultHelperPodFile          = "helperPod.yaml"
 	FlagWorkerThreads             = "worker-threads"
-	DefaultWorkerThreads   = 4
+	DefaultWorkerThreads          = pvController.DefaultThreadiness
+	FlagProvisioningRetryCount    = "provisioning-retry-count"
+	DefaultProvisioningRetryCount = pvController.DefaultFailedProvisionThreshold
+	FlagDeletionRetryCount        = "deletion-retry-count"
+	DefaultDeletionRetryCount     = pvController.DefaultFailedDeleteThreshold
 )
 
 func cmdNotFound(c *cli.Context, command string) {
@@ -114,6 +118,16 @@ func StartCmd() cli.Command {
 				Usage: "Number of provisioner worker threads.",
 				Value: DefaultWorkerThreads,
 			},
+			cli.IntFlag{
+				Name:  FlagProvisioningRetryCount,
+				Usage: "Number of retries of failed volume provisioning. 0 means retry indefinitely.",
+				Value: DefaultProvisioningRetryCount,
+			},
+			cli.IntFlag{
+				Name:  FlagDeletionRetryCount,
+				Usage: "Number of retries of failed volume deletion. 0 means retry indefinitely.",
+				Value: DefaultDeletionRetryCount,
+			},
 		},
 		Action: func(c *cli.Context) {
 			if err := startDaemon(c); err != nil {
@@ -239,8 +253,8 @@ func startDaemon(c *cli.Context) error {
 		provisioner,
 		serverVersion.GitVersion,
 		pvController.LeaderElection(false),
-		pvController.FailedProvisionThreshold(0),
-		pvController.FailedDeleteThreshold(0),
+		pvController.FailedProvisionThreshold(c.Int(FlagProvisioningRetryCount)),
+		pvController.FailedDeleteThreshold(c.Int(FlagDeletionRetryCount)),
 		pvController.Threadiness(c.Int(FlagWorkerThreads)),
 	)
 	logrus.Debug("Provisioner started")