Skip to content

Commit 552b43d

Browse files
authored
Merge pull request #446 from alvaroaleman/remove-defaulting-for-leader-election
⚠️ Remove defaulting for leader election ID
2 parents 5e2c4c8 + 687d7fc commit 552b43d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

pkg/leaderelection/leader_election.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package leaderelection
1818

1919
import (
20+
"errors"
2021
"fmt"
2122
"io/ioutil"
2223
"os"
@@ -52,9 +53,9 @@ func NewResourceLock(config *rest.Config, recorderProvider recorder.Provider, op
5253
return nil, nil
5354
}
5455

55-
// Default the LeaderElectionID
56+
// LeaderElectionID must be provided to prevent clashes
5657
if options.LeaderElectionID == "" {
57-
options.LeaderElectionID = "controller-leader-election-helper"
58+
return nil, errors.New("LeaderElectionID must be configured")
5859
}
5960

6061
// Default the namespace (if running in cluster)

pkg/manager/manager_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,16 @@ var _ = Describe("manger.Manager", func() {
144144
m, err := New(cfg, Options{
145145
LeaderElection: true,
146146
LeaderElectionNamespace: "default",
147+
LeaderElectionID: "test-leader-election-id",
147148
newResourceLock: func(config *rest.Config, recorderProvider recorder.Provider, options leaderelection.Options) (resourcelock.Interface, error) {
148149
var err error
149150
rl, err = leaderelection.NewResourceLock(config, recorderProvider, options)
150151
return rl, err
151152
},
152153
})
153-
Expect(m).ToNot(BeNil())
154154
Expect(err).ToNot(HaveOccurred())
155-
Expect(rl.Describe()).To(Equal("default/controller-leader-election-helper"))
155+
Expect(m).ToNot(BeNil())
156+
Expect(rl.Describe()).To(Equal("default/test-leader-election-id"))
156157
})
157158

158159
It("should return an error if namespace not set and not running in cluster", func() {

0 commit comments

Comments
 (0)