Skip to content

Commit 4f4d30e

Browse files
committed
leaderelection: use 'leases' as default resource lock object
Signed-off-by: Joe Lanford <[email protected]>
1 parent e52a8b1 commit 4f4d30e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkg/leaderelection/leader_election.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
2828
"k8s.io/client-go/rest"
2929
"k8s.io/client-go/tools/leaderelection/resourcelock"
30+
3031
"sigs.k8s.io/controller-runtime/pkg/recorder"
3132
)
3233

@@ -39,7 +40,7 @@ type Options struct {
3940
LeaderElection bool
4041

4142
// LeaderElectionResourceLock determines which resource lock to use for leader election,
42-
// defaults to "configmapsleases".
43+
// defaults to "leases".
4344
LeaderElectionResourceLock string
4445

4546
// LeaderElectionNamespace determines the namespace in which the leader
@@ -57,11 +58,12 @@ func NewResourceLock(config *rest.Config, recorderProvider recorder.Provider, op
5758
return nil, nil
5859
}
5960

60-
// Default resource lock to "configmapsleases". We must keep this default until we are sure all controller-runtime
61-
// users have upgraded from the original default ConfigMap lock to a controller-runtime version that has this new
62-
// default. Many users of controller-runtime skip versions, so we should be extremely conservative here.
61+
// Default resource lock to "leases". The previous default (from v0.7.0 to v0.11.x) was configmapsleases, which was
62+
// used to migrate from configmaps to leases. Since the default was "configmapsleases" for over a year, spanning
63+
// five minor releases, any actively maintained operators are very likely to have a released version that uses
64+
// "configmapsleases". Therefore defaulting to "leases" should be safe.
6365
if options.LeaderElectionResourceLock == "" {
64-
options.LeaderElectionResourceLock = resourcelock.ConfigMapsLeasesResourceLock
66+
options.LeaderElectionResourceLock = resourcelock.LeasesResourceLock
6567
}
6668

6769
// LeaderElectionID must be provided to prevent clashes

0 commit comments

Comments
 (0)