Merge pull request #43 from msau42/deprecate

Use deprecatedflags for connection-timeout

Author: k8s-ci-robot

Gopkg.lock

@@ -23,23 +23,11 @@
 
 [[constraint]]
   name = "github.com/container-storage-interface/spec"
-  version = "1.0.0-rc2"
+  version = "1.0"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/kubernetes-csi/csi-test"
-
-[[constraint]]
-  name = "google.golang.org/grpc"
-  version = "1.10.0"
-
-[[constraint]]
-  name = "github.com/golang/mock"
-  version = "1.1.1"
-
-[[constraint]]
-  name = "github.com/kubernetes-csi/csi-lib-utils"
-  version = ">=0.4.0-rc1"
+  version = "2.0"
 
 [prune]
    non-go = true

Gopkg.toml

@@ -26,17 +26,19 @@ import (
 	"k8s.io/klog"
 
 	connlib "github.com/kubernetes-csi/csi-lib-utils/connection"
+	"github.com/kubernetes-csi/csi-lib-utils/deprecatedflags"
 	"github.com/kubernetes-csi/csi-lib-utils/rpc"
+
 	"google.golang.org/grpc"
 )
 
 // Command line flags
 var (
-	// 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")
-	probeTimeout      = flag.Duration("probe-timeout", time.Second, "Probe timeout in seconds")
-	csiAddress        = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.")
-	healthzPort       = flag.String("health-port", "9808", "TCP ports for listening healthz requests")
+	probeTimeout = flag.Duration("probe-timeout", time.Second, "Probe timeout in seconds")
+	csiAddress   = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.")
+	healthzPort  = flag.String("health-port", "9808", "TCP ports for listening healthz requests")
+
+	_ = deprecatedflags.Add("connection-timeout")
 )
 
 type healthProbe struct {
@@ -74,10 +76,6 @@ func main() {
 	flag.Set("logtostderr", "true")
 	flag.Parse()
 
-	if *connectionTimeout != 0 {
-		klog.Warning("--connection-timeout is deprecated and will have no effect")
-	}
-
 	csiConn, err := connlib.Connect(*csiAddress)
 	if err != nil {
 		// connlib should retry forever so a returned error should mean