Merge pull request kubernetes-csi#173 from jsafrane/remove-deprecated-flags

2.0 prep: Remove deprecated flags

Author: k8s-ci-robot

Gopkg.lock

@@ -66,9 +66,6 @@ Note that the external-attacher does not scale with more replicas. Only one exte
 * `--retry-interval-max`: The exponential backoff maximum value. See [CSI error and timeout handling](#csi-error-and-timeout-handling) for details. 5 minutes is used by default.
 
 #### Other recognized arguments
-
-* `--dummy`: Runs the external-attacher in dummy mode, i.e. without any CSI driver. All volumes are immediately reported as attached / detached as controller-manager requires. This option can be used for debugging of other CSI components such as Kubernetes Attach / Detach controller.
-
 * `--kubeconfig <path>`: Path to Kubernetes client configuration that the external-attacher uses to connect to Kubernetes API server. When omitted, default token provided by Kubernetes will be used. This option is useful only when the external-attacher does not run as a Kubernetes pod, e.g. for debugging.
 
 * `--resync <duration>`: Internal resync interval when the external-attacher re-evaluates all existing `VolumeAttachment` instances and tries to fulfill them, i.e. attach / detach corresponding volumes. It does not affect re-tries of failed CSI calls! It should be used only when there is a bug in Kubernetes watch logic.
@@ -77,13 +74,6 @@ Note that the external-attacher does not scale with more replicas. Only one exte
 
 * All glog / klog arguments are supported, such as `-v <log level>` or `-alsologtostderr`.
 
-#### Deprecated arguments
-* `--connection-timeout <duration>`: This option was used to limit establishing connection to CSI driver. Currently, the option does not have any effect and the external-attacher tries to connect to CSI driver socket indefinitely. It is recommended to run ReadinessProbe on the driver to ensure that the driver comes up in reasonable time.
-
-* `--leader-election-type`: This option was used to choose which leader election resource type to use. Currently, the option defaults to `configmaps`, but will be removed in the future to only support `leases` based leader election.
-
-* `--leader-election-identity <id>`: This option is deprecated and has no effect since external-attacher will now use the pod hostname as the leader election identity
-
 ### CSI error and timeout handling
 The external-attacher invokes all gRPC calls to CSI driver with timeout provided by `--timeout` command line argument (15 seconds by default).
 

README.md

@@ -28,12 +28,10 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/workqueue"
-	csiinformers "k8s.io/csi-api/pkg/client/informers/externalversions"
 	"k8s.io/klog"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/csi-lib-utils/connection"
-	"github.com/kubernetes-csi/csi-lib-utils/deprecatedflags"
 	"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
 	"github.com/kubernetes-csi/csi-lib-utils/rpc"
 	"github.com/kubernetes-csi/external-attacher/pkg/attacher"
@@ -48,30 +46,23 @@ const (
 	// Default timeout of short CSI calls like GetPluginInfo
 	csiTimeout = time.Second
 
-	// Name of CSI plugin for dummy operation
-	dummyAttacherName = "csi/dummy"
-
 	leaderElectionTypeLeases     = "leases"
 	leaderElectionTypeConfigMaps = "configmaps"
 )
 
 // Command line flags
 var (
-	kubeconfig        = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.")
-	resync            = flag.Duration("resync", 10*time.Minute, "Resync interval of the controller.")
-	connectionTimeout = flag.Duration("connection-timeout", 0, "This option is deprecated.")
-	csiAddress        = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.")
-	dummy             = flag.Bool("dummy", false, "Run in dummy mode, i.e. not connecting to CSI driver and marking everything as attached. Expected CSI driver name is \"csi/dummy\".")
-	showVersion       = flag.Bool("version", false, "Show version.")
-	timeout           = flag.Duration("timeout", 15*time.Second, "Timeout for waiting for attaching or detaching the volume.")
+	kubeconfig  = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.")
+	resync      = flag.Duration("resync", 10*time.Minute, "Resync interval of the controller.")
+	csiAddress  = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.")
+	showVersion = flag.Bool("version", false, "Show version.")
+	timeout     = flag.Duration("timeout", 15*time.Second, "Timeout for waiting for attaching or detaching the volume.")
 
 	retryIntervalStart = flag.Duration("retry-interval-start", time.Second, "Initial retry interval of failed create volume or deletion. It doubles with each failure, up to retry-interval-max.")
 	retryIntervalMax   = flag.Duration("retry-interval-max", 5*time.Minute, "Maximum retry interval of failed create volume or deletion.")
 
 	enableLeaderElection    = flag.Bool("leader-election", false, "Enable leader election.")
-	leaderElectionType      = flag.String("leader-election-type", leaderElectionTypeConfigMaps, "the type of leader election, options are 'configmaps' (default) or 'leases' (recommended). The 'configmaps' option is deprecated in favor of 'leases'.")
 	leaderElectionNamespace = flag.String("leader-election-namespace", "", "Namespace where the leader election resource lives. Defaults to the pod namespace if not set.")
-	_                       = deprecatedflags.Add("leader-election-identity")
 )
 
 var (
@@ -94,10 +85,6 @@ func main() {
 	}
 	klog.Infof("Version: %s", version)
 
-	if *connectionTimeout != 0 {
-		klog.Warningf("Warning: option -connection-timeout is deprecated and has no effect")
-	}
-
 	// Create the client config. Use kubeconfig if given, otherwise assume in-cluster.
 	config, err := buildConfig(*kubeconfig)
 	if err != nil {
@@ -112,65 +99,56 @@ func main() {
 	}
 
 	factory := informers.NewSharedInformerFactory(clientset, *resync)
-	var csiFactory csiinformers.SharedInformerFactory
 	var handler controller.Handler
+	// Connect to CSI.
+	csiConn, err := connection.Connect(*csiAddress)
+	if err != nil {
+		klog.Error(err.Error())
+		os.Exit(1)
+	}
 
-	var csiAttacher string
-	if *dummy {
-		// Do not connect to any CSI, mark everything as attached.
-		handler = controller.NewTrivialHandler(clientset)
-		csiAttacher = dummyAttacherName
-	} else {
-		// Connect to CSI.
-		csiConn, err := connection.Connect(*csiAddress)
-		if err != nil {
-			klog.Error(err.Error())
-			os.Exit(1)
-		}
-
-		err = rpc.ProbeForever(csiConn, *timeout)
-		if err != nil {
-			klog.Error(err.Error())
-			os.Exit(1)
-		}
+	err = rpc.ProbeForever(csiConn, *timeout)
+	if err != nil {
+		klog.Error(err.Error())
+		os.Exit(1)
+	}
 
-		// Find driver name.
-		ctx, cancel := context.WithTimeout(context.Background(), csiTimeout)
-		defer cancel()
-		csiAttacher, err = rpc.GetDriverName(ctx, csiConn)
-		if err != nil {
-			klog.Error(err.Error())
-			os.Exit(1)
-		}
-		klog.V(2).Infof("CSI driver name: %q", csiAttacher)
+	// Find driver name.
+	ctx, cancel := context.WithTimeout(context.Background(), csiTimeout)
+	defer cancel()
+	csiAttacher, err := rpc.GetDriverName(ctx, csiConn)
+	if err != nil {
+		klog.Error(err.Error())
+		os.Exit(1)
+	}
+	klog.V(2).Infof("CSI driver name: %q", csiAttacher)
 
-		supportsService, err := supportsPluginControllerService(ctx, csiConn)
+	supportsService, err := supportsPluginControllerService(ctx, csiConn)
+	if err != nil {
+		klog.Error(err.Error())
+		os.Exit(1)
+	}
+	if !supportsService {
+		handler = controller.NewTrivialHandler(clientset)
+		klog.V(2).Infof("CSI driver does not support Plugin Controller Service, using trivial handler")
+	} else {
+		// Find out if the driver supports attach/detach.
+		supportsAttach, supportsReadOnly, err := supportsControllerPublish(ctx, csiConn)
 		if err != nil {
 			klog.Error(err.Error())
 			os.Exit(1)
 		}
-		if !supportsService {
-			handler = controller.NewTrivialHandler(clientset)
-			klog.V(2).Infof("CSI driver does not support Plugin Controller Service, using trivial handler")
+		if supportsAttach {
+			pvLister := factory.Core().V1().PersistentVolumes().Lister()
+			nodeLister := factory.Core().V1().Nodes().Lister()
+			vaLister := factory.Storage().V1beta1().VolumeAttachments().Lister()
+			csiNodeLister := factory.Storage().V1beta1().CSINodes().Lister()
+			attacher := attacher.NewAttacher(csiConn)
+			handler = controller.NewCSIHandler(clientset, csiAttacher, attacher, pvLister, nodeLister, csiNodeLister, vaLister, timeout, supportsReadOnly)
+			klog.V(2).Infof("CSI driver supports ControllerPublishUnpublish, using real CSI handler")
 		} else {
-			// Find out if the driver supports attach/detach.
-			supportsAttach, supportsReadOnly, err := supportsControllerPublish(ctx, csiConn)
-			if err != nil {
-				klog.Error(err.Error())
-				os.Exit(1)
-			}
-			if supportsAttach {
-				pvLister := factory.Core().V1().PersistentVolumes().Lister()
-				nodeLister := factory.Core().V1().Nodes().Lister()
-				vaLister := factory.Storage().V1beta1().VolumeAttachments().Lister()
-				csiNodeLister := factory.Storage().V1beta1().CSINodes().Lister()
-				attacher := attacher.NewAttacher(csiConn)
-				handler = controller.NewCSIHandler(clientset, csiAttacher, attacher, pvLister, nodeLister, csiNodeLister, vaLister, timeout, supportsReadOnly)
-				klog.V(2).Infof("CSI driver supports ControllerPublishUnpublish, using real CSI handler")
-			} else {
-				handler = controller.NewTrivialHandler(clientset)
-				klog.V(2).Infof("CSI driver does not support ControllerPublishUnpublish, using trivial handler")
-			}
+			handler = controller.NewTrivialHandler(clientset)
+			klog.V(2).Infof("CSI driver does not support ControllerPublishUnpublish, using trivial handler")
 		}
 	}
 
@@ -187,28 +165,15 @@ func main() {
 	run := func(ctx context.Context) {
 		stopCh := ctx.Done()
 		factory.Start(stopCh)
-		if csiFactory != nil {
-			csiFactory.Start(stopCh)
-		}
 		ctrl.Run(threads, stopCh)
 	}
 
 	if !*enableLeaderElection {
 		run(context.TODO())
 	} else {
-		var le leaderElection
-
 		// Name of config map with leader election lock
 		lockName := "external-attacher-leader-" + csiAttacher
-		if *leaderElectionType == leaderElectionTypeConfigMaps {
-			klog.Warningf("The '%s' leader election type is deprecated and will be removed in a future release. Use '--leader-election-type=%s' instead.", leaderElectionTypeConfigMaps, leaderElectionTypeLeases)
-			le = leaderelection.NewLeaderElectionWithConfigMaps(clientset, lockName, run)
-		} else if *leaderElectionType == leaderElectionTypeLeases {
-			le = leaderelection.NewLeaderElection(clientset, lockName, run)
-		} else {
-			klog.Errorf("--leader-election-type must be either '%s' or '%s'", leaderElectionTypeConfigMaps, leaderElectionTypeLeases)
-			os.Exit(1)
-		}
+		le := leaderelection.NewLeaderElection(clientset, lockName, run)
 
 		if *leaderElectionNamespace != "" {
 			le.WithNamespace(*leaderElectionNamespace)

cmd/csi-attacher/main.go

@@ -38,7 +38,6 @@ spec:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
             - "--leader-election"
-            - "--leader-election-type=leases"
           env:
             - name: MY_NAME
               valueFrom:

deploy/kubernetes/deployment.yaml

@@ -67,11 +67,6 @@ metadata:
   namespace: default
   name: external-attacher-cfg
 rules:
-# access to configmaps is only supported for backwards compatibility reasons
-# and can be removed once you are uses Leases (--leader-election-type=leases)
-- apiGroups: [""]
-  resources: ["configmaps"]
-  verbs: ["get", "watch", "list", "delete", "update", "create"]
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]
   verbs: ["get", "watch", "list", "delete", "update", "create"]

deploy/kubernetes/rbac.yaml

@@ -18,7 +18,7 @@ Trivial handler will be used for CSI drivers that don't support `ControllerPubli
 
 ### Real attacher
 
-"Real" attacher talks to CSI over socket (`/run/csi/socket` by default, configurable by `-csi-address`). The attacher tries to connect for `-connection-timeout` (1 minute by default), allowing CSI driver to start and create its server socket a bit later.
+"Real" attacher talks to CSI over socket (`/run/csi/socket` by default, configurable by `-csi-address`).
 
 The attacher then: