Generate complete leader election record to resolve leader election issues with LeaseLocks

zachomedia · zachomedia · commit c902b8a20578 · 2020-04-22T16:53:47.000-04:00
diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go b/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go
@@ -289,8 +289,12 @@ func (le *LeaderElector) release() bool {
 	if !le.IsLeader() {
 		return true
 	}
+	now := metav1.Now()
 	leaderElectionRecord := rl.LeaderElectionRecord{
-		LeaderTransitions: le.observedRecord.LeaderTransitions,
+		LeaderTransitions:    le.observedRecord.LeaderTransitions,
+		LeaseDurationSeconds: 1,
+		RenewTime:            now,
+		AcquireTime:          now,
 	}
 	if err := le.config.Lock.Update(context.TODO(), leaderElectionRecord); err != nil {
 		klog.Errorf("Failed to release lock: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -289,8 +289,12 @@ func (le *LeaderElector) release() bool {`
`289`	`289`	`if !le.IsLeader() {`
`290`	`290`	`return true`
`291`	`291`	`}`
	`292`	`+ now := metav1.Now()`
`292`	`293`	`leaderElectionRecord := rl.LeaderElectionRecord{`
`293`		`- LeaderTransitions: le.observedRecord.LeaderTransitions,`
	`294`	`+ LeaderTransitions: le.observedRecord.LeaderTransitions,`
	`295`	`+ LeaseDurationSeconds: 1,`
	`296`	`+ RenewTime: now,`
	`297`	`+ AcquireTime: now,`
`294`	`298`	`}`
`295`	`299`	`if err := le.config.Lock.Update(context.TODO(), leaderElectionRecord); err != nil {`
`296`	`300`	`klog.Errorf("Failed to release lock: %v", err)`