From ab47d83595264aff32e7ba60b95b64e1c1ab881b Mon Sep 17 00:00:00 2001
From: John Mulligan <jmulligan@redhat.com>
Date: Wed, 10 Apr 2019 14:47:12 -0400
Subject: [PATCH] cmd: remove old command main files

Now that the unified binary has its own main file under "cmd/"
we no longer need the split main.go files.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---
 cmd/cephfs/main.go | 63 ---------------------------------------------
 cmd/rbd/main.go    | 64 ----------------------------------------------
 2 files changed, 127 deletions(-)
 delete mode 100644 cmd/cephfs/main.go
 delete mode 100644 cmd/rbd/main.go

diff --git a/cmd/cephfs/main.go b/cmd/cephfs/main.go
deleted file mode 100644
index cbcb4a641..000000000
--- a/cmd/cephfs/main.go
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Copyright 2018 The Ceph-CSI Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"flag"
-	"os"
-
-	"github.com/ceph/ceph-csi/pkg/cephfs"
-	"github.com/ceph/ceph-csi/pkg/util"
-	"k8s.io/klog"
-)
-
-var (
-	endpoint        = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
-	driverName      = flag.String("drivername", "cephfs.csi.ceph.com", "name of the driver")
-	nodeID          = flag.String("nodeid", "", "node id")
-	volumeMounter   = flag.String("volumemounter", "", "default volume mounter (possible options are 'kernel', 'fuse')")
-	metadataStorage = flag.String("metadatastorage", "", "metadata persistence method [node|k8s_configmap]")
-	mountCacheDir   = flag.String("mountcachedir", "", "mount info cache save dir")
-)
-
-func init() {
-	klog.InitFlags(nil)
-	if err := flag.Set("logtostderr", "true"); err != nil {
-		klog.Exitf("failed to set logtostderr flag: %v", err)
-	}
-	flag.Parse()
-}
-
-func main() {
-
-	err := util.ValidateDriverName(*driverName)
-	if err != nil {
-		klog.Fatalln(err)
-	}
-	//update plugin name
-	cephfs.PluginFolder = cephfs.PluginFolder + *driverName
-
-	cp, err := util.CreatePersistanceStorage(cephfs.PluginFolder, *metadataStorage, *driverName)
-	if err != nil {
-		os.Exit(1)
-	}
-
-	driver := cephfs.NewDriver()
-	driver.Run(*driverName, *nodeID, *endpoint, *volumeMounter, *mountCacheDir, cp)
-
-	os.Exit(0)
-}
diff --git a/cmd/rbd/main.go b/cmd/rbd/main.go
deleted file mode 100644
index 18d2663cc..000000000
--- a/cmd/rbd/main.go
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright 2018 The Ceph-CSI Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"flag"
-	"os"
-
-	"github.com/ceph/ceph-csi/pkg/rbd"
-	"github.com/ceph/ceph-csi/pkg/util"
-	"k8s.io/klog"
-)
-
-var (
-	endpoint        = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
-	driverName      = flag.String("drivername", "rbd.csi.ceph.com", "name of the driver")
-	nodeID          = flag.String("nodeid", "", "node id")
-	containerized   = flag.Bool("containerized", true, "whether run as containerized")
-	metadataStorage = flag.String("metadatastorage", "", "metadata persistence method [node|k8s_configmap]")
-	configRoot      = flag.String("configroot", "/etc/csi-config", "directory in which CSI specific Ceph"+
-		" cluster configurations are present, OR the value \"k8s_objects\" if present as kubernetes secrets")
-)
-
-func init() {
-	klog.InitFlags(nil)
-	if err := flag.Set("logtostderr", "true"); err != nil {
-		klog.Exitf("failed to set logtostderr flag: %v", err)
-	}
-	flag.Parse()
-}
-
-func main() {
-
-	err := util.ValidateDriverName(*driverName)
-	if err != nil {
-		klog.Fatalln(err)
-	}
-	//update plugin name
-	rbd.PluginFolder = rbd.PluginFolder + *driverName
-
-	cp, err := util.CreatePersistanceStorage(rbd.PluginFolder, *metadataStorage, *driverName)
-	if err != nil {
-		os.Exit(1)
-	}
-
-	driver := rbd.NewDriver()
-	driver.Run(*driverName, *nodeID, *endpoint, *configRoot, *containerized, cp)
-
-	os.Exit(0)
-}