Merge pull request #255 from pohly/deprecated-option

better deprecated option handling

Author: k8s-ci-robot

Gopkg.lock

@@ -20,36 +20,30 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
-# TODO: update to 1.1.0
+# This selects the latest 1.x.y version.
 [[constraint]]
   name = "github.com/container-storage-interface/spec"
-  version = "1.0.0"
+  version = "1.0"
 
-# TODO: update to latest
 [[constraint]]
   name = "github.com/kubernetes-csi/csi-test"
-  version = "~v1.0.3"
+  version = "2.0"
 
 # TODO: remove when official 3.0.0 tagged
 [[constraint]]
   name = "sigs.k8s.io/sig-storage-lib-external-provisioner"
   version = ">=v3.0.0-beta"
 
-# TODO: can this be removed?
-[[constraint]]
-  name = "google.golang.org/grpc"
-  version = "1.9.2"
-
-# TODO: remove when official 11.0.0 tagged
-[[constraint]]
-  name = "k8s.io/client-go"
-  branch = "release-11.0"
-
 # TODO: remove when official 0.4.0 tagged
 [[constraint]]
   name = "github.com/kubernetes-csi/csi-lib-utils"
   version = ">=0.4.0-rc1"
 
+# TODO: remove when released
+[[constraint]]
+  name = "github.com/kubernetes-csi/external-snapshotter"
+  branch = "master"
+
 [prune]
   non-go = true
   go-tests = true

Gopkg.toml

@@ -27,6 +27,7 @@ import (
 
 	flag "github.com/spf13/pflag"
 
+	"github.com/kubernetes-csi/csi-lib-utils/deprecatedflags"
 	ctrl "github.com/kubernetes-csi/external-provisioner/pkg/controller"
 	snapclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
 	"sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
@@ -47,7 +48,7 @@ var (
 	master               = flag.String("master", "", "Master URL to build a client config from. Either this or kubeconfig needs to be set if the provisioner is being run out of cluster.")
 	kubeconfig           = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Either this or master needs to be set if the provisioner is being run out of cluster.")
 	csiEndpoint          = flag.String("csi-address", "/run/csi/socket", "The gRPC endpoint for Target CSI Volume.")
-	connectionTimeout    = flag.Duration("connection-timeout", 0, "This option is deprecated.")
+	_                    = deprecatedflags.Add("connection-timeout")
 	volumeNamePrefix     = flag.String("volume-name-prefix", "pvc", "Prefix to apply to the name of a created volume.")
 	volumeNameUUIDLength = flag.Int("volume-name-uuid-length", -1, "Truncates generated UUID of a created volume to this length. Defaults behavior is to NOT truncate.")
 	showVersion          = flag.Bool("version", false, "Show version.")
@@ -56,7 +57,7 @@ var (
 	retryIntervalMax     = flag.Duration("retry-interval-max", 5*time.Minute, "Maximum retry interval of failed provisioning or deletion.")
 	workerThreads        = flag.Uint("worker-threads", 100, "Number of provisioner worker threads, in other words nr. of simultaneous CSI calls.")
 	operationTimeout     = flag.Duration("timeout", 10*time.Second, "Timeout for waiting for creation or deletion of a volume")
-	provisioner          = flag.String("provisioner", "", "This option is deprecated")
+	_                    = deprecatedflags.Add("provisioner")
 
 	featureGates        map[string]bool
 	provisionController *controller.ProvisionController
@@ -75,13 +76,6 @@ func init() {
 	flag.Set("logtostderr", "true")
 	flag.Parse()
 
-	if *connectionTimeout != 0 {
-		klog.Warningf("Warning: option -connection-timeout is deprecated and has no effect")
-	}
-	if *provisioner != "" {
-		klog.Warningf("Warning: option -provisioner is deprecated and has no effect")
-	}
-
 	if err := utilfeature.DefaultFeatureGate.SetFromMap(featureGates); err != nil {
 		klog.Fatal(err)
 	}