Skip to content

Commit fef7262

Browse files
committed
Fix leader election defaults for SNO
Current defaults cause pod restarts when apiserver is unavailable for longer than 60 seconds. The values set in this patch come from https://github.com/openshift/library-go/blob/master/pkg/config/leaderelection/leaderelection.go.
1 parent fe13cde commit fef7262

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

assets/csi_controller_deployment.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ spec:
2727
args:
2828
- "--v=5"
2929
- "--leader-election=true"
30+
# Leader election values are from
31+
# https://github.com/openshift/library-go/blob/master/pkg/config/leaderelection/leaderelection.go
32+
- "--leader-election-lease-duration=137s"
33+
- "--leader-election-renew-deadline=107s"
34+
- "--leader-election-retry-period=26s"
3035
imagePullPolicy: IfNotPresent
3136
resources:
3237
requests:

pkg/operator/operator_test.go

+14-2
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,20 @@ func TestSync(t *testing.T) {
481481
const replica1 = 1
482482
const replica2 = 2
483483
const defaultImage = "csi-snapshot-controller-image"
484-
var argsLevel2 = []string{"--v=2", "--leader-election=true"}
485-
var argsLevel6 = []string{"--v=6", "--leader-election=true"}
484+
var argsLevel2 = []string{
485+
"--v=2",
486+
"--leader-election=true",
487+
"--leader-election-lease-duration=137s",
488+
"--leader-election-renew-deadline=107s",
489+
"--leader-election-retry-period=26s",
490+
}
491+
var argsLevel6 = []string{
492+
"--v=6",
493+
"--leader-election=true",
494+
"--leader-election-lease-duration=137s",
495+
"--leader-election-renew-deadline=107s",
496+
"--leader-election-retry-period=26s",
497+
}
486498

487499
// Override default timeouts to speed up tests
488500
customResourceReadyInterval = 10 * time.Millisecond

0 commit comments

Comments
 (0)