github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-20 01:04:06 +00:00
Code Issues Projects Releases Wiki Activity

daemon: remove unused done channel

Browse Source 
Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Williams 2023-09-08 13:37:37 -05:00
parent 7c68481e43
commit 1605ffcad5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/multus-daemon/main.go
View File

@ -59,7 +59,6 @@ func main() {
} }
configWatcherDoneChannel := make(chan struct{}) configWatcherDoneChannel := make(chan struct{})
serverDoneChannel := make(chan struct{})
multusConfigFile := "" multusConfigFile := ""
ctx := context.Background() ctx := context.Background()
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
@ -87,7 +86,7 @@ func main() {
logging.Verbosef("Readiness Indicator file check done!") logging.Verbosef("Readiness Indicator file check done!")
} }
if err := startMultusDaemon(ctx, daemonConf, serverDoneChannel); err != nil { if err := startMultusDaemon(ctx, daemonConf); err != nil {
logging.Panicf("failed start the multus thick-plugin listener: %v", err) logging.Panicf("failed start the multus thick-plugin listener: %v", err)
os.Exit(3) os.Exit(3)
} }
@ -181,7 +180,7 @@ func waitUntilAPIReady(socketPath string) error {
}) })
} }
func startMultusDaemon(ctx context.Context, daemonConfig *srv.ControllerNetConf, done chan struct{}) error { func startMultusDaemon(ctx context.Context, daemonConfig *srv.ControllerNetConf) error {
if user, err := user.Current(); err != nil || user.Uid != "0" { if user, err := user.Current(); err != nil || user.Uid != "0" {
return fmt.Errorf("failed to run multus-daemon with root: %v, now running in uid: %s", err, user.Uid) return fmt.Errorf("failed to run multus-daemon with root: %v, now running in uid: %s", err, user.Uid)
} }