Skip to content

Commit

Permalink
Remove deprecated containerized
Browse files Browse the repository at this point in the history
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 <madhupr007@gmail.com>
  • Loading branch information
Madhu-1 authored and mergify[bot] committed Dec 11, 2019
1 parent 9e0cd48 commit 118f345
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
6 changes: 0 additions & 6 deletions cmd/cephcsi.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion docs/deploy-rbd.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. |
Expand Down
3 changes: 0 additions & 3 deletions pkg/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 118f345

Please sign in to comment.