Skip to content

Commit 5c598f1

Browse files
committed
fix: Improve error message formatting in leader election configuration
Signed-off-by: Magnus Ullberg <magnus@ullberg.us>
1 parent e2bd40b commit 5c598f1

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

cmd/main.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,7 @@ func parseLeaderElectionConfig(enableLeaderElection bool, leaderElectionNamespac
228228
var err error
229229
enableLeaderElection, err = strconv.ParseBool(val)
230230
if err != nil {
231-
//lint:ignore ST1005 Environment variable name
232-
return false, "", fmt.Errorf("Invalid LEASE_LEADER_ELECTION value: %v", err)
231+
return false, "", fmt.Errorf("invalid LEASE_LEADER_ELECTION value: %v", err)
233232
}
234233

235234
if enableLeaderElection && leaderElectionNamespace == "" {
@@ -238,8 +237,7 @@ func parseLeaderElectionConfig(enableLeaderElection bool, leaderElectionNamespac
238237

239238
if enableLeaderElection && leaderElectionNamespace == "" {
240239
if _, err := statFn("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); os.IsNotExist(err) {
241-
//lint:ignore ST1005 Environment variable name
242-
return false, "", fmt.Errorf("Leader election enabled but LEASE_LEADER_ELECTION_NAMESPACE is not set. Please set it to a valid namespace.")
240+
return false, "", fmt.Errorf("leader election enabled but LEASE_LEADER_ELECTION_NAMESPACE is not set; set it to a valid namespace")
243241
}
244242
// we're in a cluster; default to serviceaccount namespace
245243
if data, err := readFileFn("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {

0 commit comments

Comments
 (0)