From c0005241d39e57f9a971184914cc317b66d1c0e2 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 6 Apr 2023 14:25:57 +0530 Subject: [PATCH] Enabled leader election based leases Signed-off-by: Humble Chirammal --- cmd/nfs-subdir-external-provisioner/provisioner.go | 10 +--------- deploy/rbac.yaml | 3 +++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cmd/nfs-subdir-external-provisioner/provisioner.go b/cmd/nfs-subdir-external-provisioner/provisioner.go index e124757d..967d7c35 100644 --- a/cmd/nfs-subdir-external-provisioner/provisioner.go +++ b/cmd/nfs-subdir-external-provisioner/provisioner.go @@ -36,7 +36,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" storagehelpers "k8s.io/component-helpers/storage/volume" - "sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller" + "sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller" ) const ( @@ -245,13 +245,6 @@ func main() { glog.Fatalf("Failed to create client: %v", err) } - // The controller needs to know what the server version is because out-of-tree - // provisioners aren't officially supported until 1.5 - serverVersion, err := clientset.Discovery().ServerVersion() - if err != nil { - glog.Fatalf("Error getting server version: %v", err) - } - leaderElection := true leaderElectionEnv := os.Getenv("ENABLE_LEADER_ELECTION") if leaderElectionEnv != "" { @@ -271,7 +264,6 @@ func main() { pc := controller.NewProvisionController(clientset, provisionerName, clientNFSProvisioner, - serverVersion.GitVersion, controller.LeaderElection(leaderElection), ) // Never stops. diff --git a/deploy/rbac.yaml b/deploy/rbac.yaml index 28dbb68d..91698b23 100644 --- a/deploy/rbac.yaml +++ b/deploy/rbac.yaml @@ -50,6 +50,9 @@ rules: - apiGroups: [""] resources: ["endpoints"] verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: ["get", "create", "update"] --- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1