Merge branch 'master' into status-52
This commit is contained in:
@@ -66,7 +66,7 @@ var (
|
||||
snapshotNamePrefix = flag.String("snapshot-name-prefix", "snapshot", "Prefix to apply to the name of a created snapshot")
|
||||
snapshotNameUUIDLength = flag.Int("snapshot-name-uuid-length", -1, "Length in characters for the generated uuid of a created snapshot. Defaults behavior is to NOT truncate.")
|
||||
showVersion = flag.Bool("version", false, "Show version.")
|
||||
csiTimeout = flag.Duration("timeout", defaultCSITimeout, "The timeout for any RPCs to the CSI driver. Default is 10s.")
|
||||
csiTimeout = flag.Duration("timeout", defaultCSITimeout, "The timeout for any RPCs to the CSI driver. Default is 1 minute.")
|
||||
|
||||
leaderElection = flag.Bool("leader-election", false, "Enables leader election.")
|
||||
leaderElectionNamespace = flag.String("leader-election-namespace", "", "The namespace where the leader election resource exists. Defaults to the pod namespace if not set.")
|
||||
@@ -184,9 +184,9 @@ func main() {
|
||||
snapClient,
|
||||
kubeClient,
|
||||
*snapshotterName,
|
||||
factory.Volumesnapshot().V1alpha1().VolumeSnapshots(),
|
||||
factory.Volumesnapshot().V1alpha1().VolumeSnapshotContents(),
|
||||
factory.Volumesnapshot().V1alpha1().VolumeSnapshotClasses(),
|
||||
factory.Snapshot().V1alpha1().VolumeSnapshots(),
|
||||
factory.Snapshot().V1alpha1().VolumeSnapshotContents(),
|
||||
factory.Snapshot().V1alpha1().VolumeSnapshotClasses(),
|
||||
coreFactory.Core().V1().PersistentVolumeClaims(),
|
||||
*createSnapshotContentRetryCount,
|
||||
*createSnapshotContentInterval,
|
||||
|
Reference in New Issue
Block a user