From 118f34525eab180e340bcc454ac3e227631d68e6 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 11 Dec 2019 12:13:31 +0530 Subject: [PATCH] Remove deprecated containerized As we are moving towards v2.0.0 I think it's a good time to remove the deprecated flag. Signed-off-by: Madhu Rajanna --- cmd/cephcsi.go | 6 ------ docs/deploy-rbd.md | 1 - pkg/util/util.go | 3 --- 3 files changed, 10 deletions(-) diff --git a/cmd/cephcsi.go b/cmd/cephcsi.go index 2e76b1c18..817200c7c 100644 --- a/cmd/cephcsi.go +++ b/cmd/cephcsi.go @@ -60,9 +60,6 @@ func init() { flag.BoolVar(&conf.IsControllerServer, "controllerserver", false, "start cephcsi controller server") flag.BoolVar(&conf.IsNodeServer, "nodeserver", false, "start cephcsi node server") - // rbd related flags - flag.BoolVar(&conf.Containerized, "containerized", false, "whether run as containerized") - // cephfs related flags flag.StringVar(&conf.MountCacheDir, "mountcachedir", "", "mount info cache save dir") flag.BoolVar(&conf.ForceKernelCephFS, "forcecephkernelclient", false, "enable Ceph Kernel clients on kernel < 4.17 which support quotas") @@ -173,9 +170,6 @@ func main() { switch conf.Vtype { case rbdType: driver := rbd.NewDriver() - if conf.Containerized { - klog.Warning("containerized flag is deprecated and will be removed") - } driver.Run(&conf, cp) case cephfsType: diff --git a/docs/deploy-rbd.md b/docs/deploy-rbd.md index df84ebc5e..d50730b8a 100644 --- a/docs/deploy-rbd.md +++ b/docs/deploy-rbd.md @@ -33,7 +33,6 @@ make image-cephcsi | `--drivername` | `rbd.csi.ceph.com` | Name of the driver (Kubernetes: `provisioner` field in StorageClass must correspond to this value) | | `--nodeid` | _empty_ | This node's ID | | `--type` | _empty_ | Driver type `[rbd | cephfs]` If the driver type is set to `rbd` it will act as a `rbd plugin` or if it's set to `cephfs` will act as a `cephfs plugin` | -| `--containerized` | false | Whether running in containerized mode( This flag is deprecated) | | `--instanceid` | "default" | Unique ID distinguishing this instance of Ceph CSI among other instances, when sharing Ceph clusters across CSI instances for provisioning | | `--metadatastorage` | _empty_ | Points to where legacy (1.0.0 or older plugin versions) metadata about provisioned volumes are kept, as file or in as k8s configmap (`node` or `k8s_configmap` respectively) | | `--pidlimit` | _0_ | Configure the PID limit in cgroups. The container runtime can restrict the number of processes/tasks which can cause problems while provisioning (or deleting) a large number of volumes. A value of `-1` configures the limit to the maximum, `0` does not configure limits at all. | diff --git a/pkg/util/util.go b/pkg/util/util.go index 27ba598a4..a012adf13 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -99,9 +99,6 @@ type Config struct { IsNodeServer bool // if set to true start node server Version bool // cephcsi version - // rbd related flag - Containerized bool // whether run as containerized - // cephfs related flags ForceKernelCephFS bool // force to use the ceph kernel client even if the kernel is < 4.17