Rebase to rc2

cmd/csi-snapshotter/main.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/csi-lib-utils/connection"
@@ -193,7 +193,13 @@ func main() {
 		run(context.TODO())
 	} else {
 		lockName := fmt.Sprintf("%s-%s", prefix, strings.Replace(driverName, "/", "-", -1))
-		le := leaderelection.NewLeaderElection(kubeClient, lockName, run)
+		// Create a new clientset for leader election to prevent throttling
+		// due to snapshot sidecar
+		leClientset, err := kubernetes.NewForConfig(config)
+		if err != nil {
+			klog.Fatalf("failed to create leaderelection client: %v", err)
+		}
+		le := leaderelection.NewLeaderElection(leClientset, lockName, run)
 		if *leaderElectionNamespace != "" {
 			le.WithNamespace(*leaderElectionNamespace)
 		}

cmd/snapshot-controller/main.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 
 	"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
 	controller "github.com/kubernetes-csi/external-snapshotter/v2/pkg/common-controller"
@@ -120,7 +120,13 @@ func main() {
 		run(context.TODO())
 	} else {
 		lockName := "snapshot-controller-leader"
-		le := leaderelection.NewLeaderElection(kubeClient, lockName, run)
+		// Create a new clientset for leader election to prevent throttling
+		// due to snapshot controller
+		leClientset, err := kubernetes.NewForConfig(config)
+		if err != nil {
+			klog.Fatalf("failed to create leaderelection client: %v", err)
+		}
+		le := leaderelection.NewLeaderElection(leClientset, lockName, run)
 		if *leaderElectionNamespace != "" {
 			le.WithNamespace(*leaderElectionNamespace)
 		}

go.mod

@@ -5,62 +5,42 @@ go 1.12
 require (
 	github.com/container-storage-interface/spec v1.2.0
 	github.com/golang/mock v1.4.3
-	github.com/golang/protobuf v1.3.5
-	github.com/google/go-cmp v0.4.0 // indirect
+	github.com/golang/protobuf v1.4.2
 	github.com/imdario/mergo v0.3.9 // indirect
 	github.com/kubernetes-csi/csi-lib-utils v0.7.0
 	github.com/kubernetes-csi/csi-test v2.0.0+incompatible
-	github.com/prometheus/client_golang v1.0.0
+	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.4.1
+	github.com/prometheus/common v0.10.0
 	google.golang.org/grpc v1.28.0
-	k8s.io/api v0.18.0
-	k8s.io/apimachinery v0.18.0
-	k8s.io/client-go v0.18.0
-	k8s.io/code-generator v0.18.0
-	k8s.io/component-base v0.18.0
-	k8s.io/klog v1.0.0
-	k8s.io/kubernetes v1.18.0
+	k8s.io/api v0.19.0-rc.2
+	k8s.io/apimachinery v0.19.0-rc.2
+	k8s.io/client-go v0.19.0-rc.2
+	k8s.io/code-generator v0.19.0-rc.2
+	k8s.io/component-base v0.19.0-rc.2
+	k8s.io/klog/v2 v2.2.0
 )
 
-replace k8s.io/api => k8s.io/api v0.18.0
-
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
-
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
-
-replace k8s.io/apiserver => k8s.io/apiserver v0.18.0
-
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
-
-replace k8s.io/client-go => k8s.io/client-go v0.18.0
-
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
-
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
-
-replace k8s.io/code-generator => k8s.io/code-generator v0.18.0
-
-replace k8s.io/component-base => k8s.io/component-base v0.18.0
-
-replace k8s.io/cri-api => k8s.io/cri-api v0.18.0
-
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
-
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
-
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
-
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
-
-replace k8s.io/kubectl => k8s.io/kubectl v0.18.0
-
-replace k8s.io/kubelet => k8s.io/kubelet v0.18.0
-
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
-
-replace k8s.io/metrics => k8s.io/metrics v0.18.0
-
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
-
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
+replace (
+	k8s.io/api => k8s.io/api v0.19.0-rc.2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-rc.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-rc.2
+	k8s.io/apiserver => k8s.io/apiserver v0.19.0-rc.2
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0-rc.2
+	k8s.io/client-go => k8s.io/client-go v0.19.0-rc.2
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0-rc.2
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-rc.2
+	k8s.io/code-generator => k8s.io/code-generator v0.19.0-rc.2
+	k8s.io/component-base => k8s.io/component-base v0.19.0-rc.2
+	k8s.io/cri-api => k8s.io/cri-api v0.19.0-rc.2
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0-rc.2
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0-rc.2
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-rc.2
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-rc.2
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.2
+	k8s.io/kubectl => k8s.io/kubectl v0.19.0-rc.2
+	k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.2
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0-rc.2
+	k8s.io/metrics => k8s.io/metrics v0.19.0-rc.2
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-rc.2
+)