Merge pull request #1622 from kolyshkin/rm-devm

Remove devicemapper storage driver

.cirrus.yml

@@ -126,7 +126,7 @@ lint_task:
         folder: $GOPATH/pkg/mod
     build_script: |
       apt-get update
-      apt-get install -y libbtrfs-dev libdevmapper-dev
+      apt-get install -y libbtrfs-dev
     test_script: |
       make TAGS=regex_precompile local-validate
       make lint

Makefile

@@ -27,7 +27,7 @@
 	vendor-in-container
 
 NATIVETAGS :=
-AUTOTAGS := $(shell ./hack/btrfs_tag.sh) $(shell ./hack/libdm_tag.sh) $(shell ./hack/libsubid_tag.sh)
+AUTOTAGS := $(shell ./hack/btrfs_tag.sh) $(shell ./hack/libsubid_tag.sh)
 BUILDFLAGS := -tags "$(AUTOTAGS) $(TAGS)" $(FLAGS)
 GO ?= go
 TESTFLAGS := $(shell $(GO) test -race $(BUILDFLAGS) ./pkg/stringutils 2>&1 > /dev/null && echo -race)

docs/containers-storage.conf.5.md

@@ -27,7 +27,7 @@ No bare options are used. The format of TOML can be simplified to:
 The `storage` table supports the following options:
 
 **driver**=""
-  Copy On Write (COW) container storage driver. Valid drivers are "overlay", "vfs", "devmapper", "aufs", "btrfs", and "zfs". Some drivers (for example, "zfs", "btrfs", and "aufs") may not work if your kernel lacks support for the filesystem.
+  Copy On Write (COW) container storage driver. Valid drivers are "overlay", "vfs", "aufs", "btrfs", and "zfs". Some drivers (for example, "zfs", "btrfs", and "aufs") may not work if your kernel lacks support for the filesystem.
 This field is required to guarantee proper operation.
 Valid rootless drivers are "btrfs", "overlay", and "vfs".
 Rootless users default to the driver defined in the system configuration when possible.
@@ -158,66 +158,6 @@ The `storage.options.btrfs` table supports the following options:
 **size**=""
   Maximum size of a container image.   This flag can be used to set quota on the size of container images. (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
 
-### STORAGE OPTIONS FOR THINPOOL (devicemapper) TABLE
-
-The `storage.options.thinpool` table supports the following options for the `devicemapper` driver:
-
-**autoextend_percent**=""
-  Tells the thinpool driver the amount by which the thinpool needs to be grown. This is specified in terms of % of pool size. So a value of 20 means that when threshold is hit, pool will be grown by 20% of existing pool size. (default: 20%)
-
-**autoextend_threshold**=""
-  Tells the driver the thinpool extension threshold in terms of percentage of pool size. For example, if threshold is 60, that means when pool is 60% full, threshold has been hit. (default: 80%)
-
-**basesize**=""
-  Specifies the size to use when creating the base device, which limits the size of images and containers. (default: 10g)
-
-**blocksize**=""
-  Specifies a custom blocksize to use for the thin pool. (default: 64k)
-
-**directlvm_device**=""
-  Specifies a custom block storage device to use for the thin pool. Required for using graphdriver `devicemapper`.
-
-**directlvm_device_force**=""
-  Tells driver to wipe device (directlvm_device) even if device already has a filesystem.  (default: false)
-
-**fs**="xfs"
-  Specifies the filesystem type to use for the base device. (default: xfs)
-
-**log_level**=""
-  Sets the log level of devicemapper.
-
-    0: LogLevelSuppress 0 (default)
-    2: LogLevelFatal
-    3: LogLevelErr
-    4: LogLevelWarn
-    5: LogLevelNotice
-    6: LogLevelInfo
-    7: LogLevelDebug
-
-**metadata_size**=""
-  metadata_size is used to set the `pvcreate --metadatasize` options when creating thin devices. (Default 128k)
-
-**min_free_space**=""
-  Specifies the min free space percent in a thin pool required for new device creation to succeed. Valid values are from 0% - 99%. Value 0% disables. (default: 10%)
-
-**mkfsarg**=""
-  Specifies extra mkfs arguments to be used when creating the base device.
-
-**mountopt**=""
-  Comma separated list of default options to be used to mount container images.  Suggested value "nodev". Mount options are documented in the mount(8) man page.
-
-**size**=""
-  Maximum size of a container image.  This flag can be used to set quota on the size of container images. (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
-
-**use_deferred_deletion**=""
-  Marks thinpool device for deferred deletion. If the thinpool is in use when the driver attempts to delete it, the driver will attempt to delete device every 30 seconds until successful, or when it restarts.  Deferred deletion permanently deletes the device and all data stored in the device will be lost. (default: true).
-
-**use_deferred_removal**=""
-  Marks devicemapper block device for deferred removal.  If the device is in use when its driver attempts to remove it, the driver tells the kernel to remove the device as soon as possible.  Note this does not free up the disk space, use deferred deletion to fully remove the thinpool.  (default: true).
-
-**xfs_nospace_max_retries**=""
-  Specifies the maximum number of retries XFS should attempt to complete IO when ENOSPC (no space) error is returned by underlying storage device. (default: 0, which means to try continuously.)
-
 ### STORAGE OPTIONS FOR OVERLAY TABLE
 
 The `storage.options.overlay` table supports the following options: