alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate --snapshotter option

Browse Source 
There is no reason why driver name should not be used as snapshotter name.
It only confuses people and adds unnecessary redundancy.
This commit is contained in:
Jan Safranek
2019-03-13 17:57:10 +01:00
parent aae81aa00c
commit bf768d8cb4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/csi-snapshotter/main.go
View File

@@ -50,7 +50,7 @@ const (
// Command line flags // Command line flags
var ( var (
snapshotter = flag.String("snapshotter", "", "Name of the snapshotter. The snapshotter will only create snapshot content for snapshot that requests a VolumeSnapshotClass with a snapshotter field set equal to this name.") snapshotter = flag.String("snapshotter", "", "This option is deprecated.")
kubeconfig = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.") kubeconfig = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.")
connectionTimeout = flag.Duration("connection-timeout", 0, "The --connection-timeout flag is deprecated") connectionTimeout = flag.Duration("connection-timeout", 0, "The --connection-timeout flag is deprecated")
csiAddress = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.") csiAddress = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.")
@@ -79,6 +79,9 @@ func main() {
if *connectionTimeout != 0 { if *connectionTimeout != 0 {
glog.Warning("--connection-timeout is deprecated and will have no effect") glog.Warning("--connection-timeout is deprecated and will have no effect")
} }
if *snapshotter != "" {
glog.Warning("--snapshotter is deprecated and will have no effect")
}
// Create the client config. Use kubeconfig if given, otherwise assume in-cluster. // Create the client config. Use kubeconfig if given, otherwise assume in-cluster.
config, err := buildConfig(*kubeconfig) config, err := buildConfig(*kubeconfig)
@@ -131,12 +134,10 @@ func main() {
defer cancel() defer cancel()
// Find driver name // Find driver name
if *snapshotter == "" { *snapshotter, err = csiConn.GetDriverName(ctx)
*snapshotter, err = csiConn.GetDriverName(ctx) if err != nil {
if err != nil { glog.Error(err.Error())
glog.Error(err.Error()) os.Exit(1)
os.Exit(1)
}
} }
glog.V(2).Infof("CSI driver name: %q", *snapshotter) glog.V(2).Infof("CSI driver name: %q", *snapshotter)