Migrated leader election to lease API

kubernetes-sigs · May 31, 2022 · e0c7be1 · e0c7be1
1 parent a35bec6
commit e0c7be1
Show file tree

Hide file tree

Showing 10 changed files with 403 additions and 101 deletions.
diff --git a/controller/controller.go b/controller/controller.go
@@ -865,11 +865,11 @@ func (ctrl *ProvisionController) Run(ctx context.Context) {
 	go ctrl.volumeStore.Run(ctx, DefaultThreadiness)
 
 	if ctrl.leaderElection {
-		rl, err := resourcelock.New("endpoints",
+		rl, err := resourcelock.New(resourcelock.EndpointsLeasesResourceLock,
 			ctrl.leaderElectionNamespace,
 			strings.Replace(ctrl.provisionerName, "/", "-", -1),
 			ctrl.client.CoreV1(),
-			nil,
+			ctrl.client.CoordinationV1(),
 			resourcelock.ResourceLockConfig{
 				Identity:      ctrl.id,
 				EventRecorder: ctrl.eventRecorder,

diff --git a/go.mod b/go.mod
@@ -4,14 +4,11 @@ go 1.16
 
 require (
 	github.com/miekg/dns v1.1.29
-	github.com/onsi/ginkgo v1.12.0 // indirect
-	github.com/onsi/gomega v1.9.0 // indirect
 	github.com/prometheus/client_golang v1.5.1
 	github.com/prometheus/client_model v0.2.0
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	k8s.io/api v0.19.1
-	k8s.io/apimachinery v0.19.1
-	k8s.io/client-go v0.19.1
-	k8s.io/klog/v2 v2.3.0
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
+	k8s.io/api v0.24.0
+	k8s.io/apimachinery v0.24.0
+	k8s.io/client-go v0.24.0
+	k8s.io/klog/v2 v2.60.1
 )
diff --git a/go.sum b/go.sum
diff --git a/mount/mountinfo_linux.go b/mount/mountinfo_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/mount/mountinfo_unsupported.go b/mount/mountinfo_unsupported.go
@@ -1,3 +1,4 @@
+//go:build (!windows && !linux && !freebsd && !solaris) || (freebsd && !cgo) || (solaris && !cgo)
 // +build !windows,!linux,!freebsd,!solaris freebsd,!cgo solaris,!cgo
 
 /*

diff --git a/repo-infra/verify/boilerplate/boilerplate.py b/repo-infra/verify/boilerplate/boilerplate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2015 The Kubernetes Authors.
 #
@@ -181,8 +181,8 @@ def get_regexs():
     # dates can be 2014, 2015, 2016, ..., CURRENT_YEAR, company holder names can be anything
     years = range(2014, date.today().year + 1)
     regexs["date"] = re.compile( '(%s)' % "|".join(map(lambda l: str(l), years)) )
-    # strip // +build \n\n build constraints
-    regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n", re.MULTILINE)
+    # strip (//go:build \n\n) and (// +build \n\n) build constraints
+    regexs["go_build_constraints"] = re.compile(r"^(//(go:| \+)build.*\n)+\n", re.MULTILINE)
     # strip #!.* from shell scripts
     regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE)
     return regexs

diff --git a/repo-infra/verify/boilerplate/boilerplate_test.py b/repo-infra/verify/boilerplate/boilerplate_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2016 The Kubernetes Authors.
 #
@@ -28,7 +28,7 @@ class TestBoilerplate(unittest.TestCase):
   """
   Note: run this test from the hack/boilerplate directory.
 
-  $ python -m unittest boilerplate_test
+  $ python3 -m unittest boilerplate_test
   """
 
   def test_boilerplate(self):

diff --git a/repo-infra/verify/boilerplate/test/fail.py b/repo-infra/verify/boilerplate/test/fail.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2015 The Kubernetes Authors.
 #

diff --git a/repo-infra/verify/boilerplate/test/pass.py b/repo-infra/verify/boilerplate/test/pass.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2015 The Kubernetes Authors.
 #

diff --git a/repo-infra/verify/verify-boilerplate.sh b/repo-infra/verify/verify-boilerplate.sh
@@ -38,7 +38,7 @@ cleanup() {
 }
 
 pushd "${boilerDir}" >/dev/null
-if ! python -m unittest boilerplate_test 2>"${unitTestOut}"; then
+if ! python3 -m unittest boilerplate_test 2>"${unitTestOut}"; then
 	echo "boilerplate_test.py failed"
 	echo
 	cat "${unitTestOut}"