Skip to content

Commit 45dcd3d

Browse files
committed
fix: id instead of leader
1 parent df1d34a commit 45dcd3d

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

controller/controller.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package controller
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
76
"os"
87
"reflect"
98
"regexp"
@@ -152,7 +151,6 @@ func NewObjectStorageControllerWithClientset(identity string, leaderLockName str
152151
}
153152

154153
rb := record.NewBroadcaster()
155-
leader := sanitize(fmt.Sprintf("%s/%s", leaderLockName, identity))
156154

157155
extendedScheme := scheme.Scheme
158156
if err := v1alpha1.AddToScheme(extendedScheme); err != nil {
@@ -161,7 +159,7 @@ func NewObjectStorageControllerWithClientset(identity string, leaderLockName str
161159

162160
return &ObjectStorageController{
163161
eventBroadcaster: rb,
164-
eventRecorder: rb.NewRecorder(extendedScheme, v1.EventSource{Component: leader}),
162+
eventRecorder: rb.NewRecorder(extendedScheme, v1.EventSource{Component: id}),
165163

166164
identity: id,
167165
kubeClient: kubeClient,
@@ -192,7 +190,7 @@ func (c *ObjectStorageController) Run(ctx context.Context) error {
192190
return ns
193191
}
194192

195-
if data, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
193+
if data, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
196194
if ns := strings.TrimSpace(string(data)); len(ns) > 0 {
197195
return ns
198196
}

0 commit comments

Comments
 (0)